Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all
Unified · Split
| @@ -193,12 +193,7 @@ static const uint32_t INVALID_FRAME = UINT32_MAX; · 192 unmodified lines | |||
| 193 | 193 | ||
| 194 | static const float PHYSICS_READY_RANGE = 3.0f; // how far from avatar to check for entities that aren't ready for simulation | 194 | static const float PHYSICS_READY_RANGE = 3.0f; // how far from avatar to check for entities that aren't ready for simulation |
| 195 | 195 | ||
| 196 | #ifndef __APPLE__ | ||
| 197 | static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); | 196 | static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); |
| 198 | #else | ||
| 199 | // Temporary fix to Qt bug: http://stackoverflow.com/questions/16194475 | ||
| 200 | static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation).append("/script.js"); | ||
| 201 | #endif | ||
| 202 | 197 | ||
| 203 | Setting::Handle<int> maxOctreePacketsPerSecond("maxOctreePPS", DEFAULT_MAX_OCTREE_PPS); | 198 | Setting::Handle<int> maxOctreePacketsPerSecond("maxOctreePPS", DEFAULT_MAX_OCTREE_PPS); |
| 204 | 199 | ||