aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llcontroldef.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llcontroldef.cpp')
-rw-r--r--linden/indra/newview/llcontroldef.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/newview/llcontroldef.cpp b/linden/indra/newview/llcontroldef.cpp
index 97fd268..7534fd5 100644
--- a/linden/indra/newview/llcontroldef.cpp
+++ b/linden/indra/newview/llcontroldef.cpp
@@ -480,11 +480,12 @@ void declare_settings()
480 gSavedSettings.declareBOOL("RenderGroupTitleAll", TRUE, "Show group titles in name labels"); 480 gSavedSettings.declareBOOL("RenderGroupTitleAll", TRUE, "Show group titles in name labels");
481 481
482 // Camera widget controls 482 // Camera widget controls
483 const S32 CAMERA_OFFSET = 64;
483 const S32 CAMERA_LEFT = MOVE_BTN_FLY_RIGHT + 10; 484 const S32 CAMERA_LEFT = MOVE_BTN_FLY_RIGHT + 10;
484 const S32 CAMERA_WIDTH = 16 + 64 + 16 + 64 + 16; 485 const S32 CAMERA_WIDTH = 16 + 64 + 16 + 64 + 16;
485 const S32 CAMERA_HEIGHT = 64; 486 const S32 CAMERA_HEIGHT = 64;
486 gSavedSettings.declareRect("FloaterCameraRect", 487 gSavedSettings.declareRect("FloaterCameraRect",
487 LLRect(CAMERA_LEFT, CAMERA_HEIGHT, CAMERA_LEFT+CAMERA_WIDTH, 0), "Rectangle for camera control window"); 488 LLRect(CAMERA_LEFT + CAMERA_OFFSET, CAMERA_HEIGHT + CAMERA_OFFSET, CAMERA_LEFT+CAMERA_WIDTH + CAMERA_OFFSET, 0 + CAMERA_OFFSET), "Rectangle for camera control window");
488 489
489 // Tool view 490 // Tool view
490 LLRect floater_tools_rect; 491 LLRect floater_tools_rect;
@@ -1298,6 +1299,9 @@ void declare_settings()
1298 gSavedSettings.declareRect("FloaterDayCycleRect", LLRect(50, 450, 300, 0), "Rectangle for Day Cycle Editor" ); 1299 gSavedSettings.declareRect("FloaterDayCycleRect", LLRect(50, 450, 300, 0), "Rectangle for Day Cycle Editor" );
1299 gSavedSettings.declareRect("FloaterAdvancedWaterRect", LLRect(50, 220, 450, 0), "Rectangle for Advanced Water Editor" ); 1300 gSavedSettings.declareRect("FloaterAdvancedWaterRect", LLRect(50, 220, 450, 0), "Rectangle for Advanced Water Editor" );
1300 1301
1302 // Graphics compatibility and driver crash workaround params
1303 gSavedSettings.declareBOOL("UseStartScreen", TRUE, "Whether to load a start screen image or not.");
1304
1301 // Tweaked draw distance default settings 1305 // Tweaked draw distance default settings
1302 gSavedSettings.declareBOOL("Disregard128DefaultDrawDistance", TRUE, "Whether to use the auto default to 128 draw distance"); 1306 gSavedSettings.declareBOOL("Disregard128DefaultDrawDistance", TRUE, "Whether to use the auto default to 128 draw distance");
1303 gSavedSettings.declareBOOL("Disregard96DefaultDrawDistance", TRUE, "Whether to use the auto default to 96 draw distance"); 1307 gSavedSettings.declareBOOL("Disregard96DefaultDrawDistance", TRUE, "Whether to use the auto default to 96 draw distance");