diff options
| author | Don Kjer <don@lindenlab.com> | 2007-09-14 21:13:20 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-09-14 21:13:20 +0000 |
| commit | 13c391f1984bb8cb9d67a7729af2ee5714409215 (patch) | |
| tree | 112edff1d25adabb4893e6746ba76a4182865f8a /indra/newview/llviewermenu.cpp | |
| parent | b3d807d5ff8dca6c891e9a5e0ddc7bc147d69f8c (diff) | |
EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 0fea0ffb30..21a334e70b 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -748,9 +748,12 @@ void init_client_menu(LLMenuGL* menu) NULL, &menu_check_control, (void*)"HighResSnapshot")); - - menu->append(new LLMenuItemToggleGL("Quiet Snapshots to Disk", - &gQuietSnapshot)); + + menu->append(new LLMenuItemCheckGL( "Quiet Snapshots to Disk", + &menu_toggle_control, + NULL, + &menu_check_control, + (void*)"QuietSnapshotsToDisk")); menu->append(new LLMenuItemCheckGL( "Compress Snapshots to Disk", &menu_toggle_control, @@ -877,8 +880,11 @@ void init_client_menu(LLMenuGL* menu) &menu_check_control, (void*)"LimitSelectDistance")); - menu->append(new LLMenuItemToggleGL("Disable Camera Constraints", - &LLViewerCamera::sDisableCameraConstraints, 'C', MASK_ALT | MASK_CONTROL )); + menu->append(new LLMenuItemCheckGL("Disable Camera Constraints", + &menu_toggle_control, + NULL, + &menu_check_control, + (void*)"DisableCameraConstraints")); menu->append(new LLMenuItemCheckGL("Joystick Flycam", &handle_toggle_flycam,NULL,&check_flycam,NULL)); |