aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--linden/indra/newview/llviewermenu.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 0c92141..7ed6bb1 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -1062,9 +1062,9 @@ extern BOOL gDebugSelectMgr;
1062 1062
1063void init_debug_ui_menu(LLMenuGL* menu) 1063void init_debug_ui_menu(LLMenuGL* menu)
1064{ 1064{
1065 // For Imprudence 1.3 - need to XUIfy 1065 // For Imprudence 1.3 - need to XUIfy (or move back to preferences?)
1066 menu->append(new LLMenuItemCheckGL("Use default system color picker", menu_toggle_control, NULL, menu_check_control, (void*)"UseDefaultColorPicker")); 1066 menu->append(new LLMenuItemCheckGL("Use default system color picker", menu_toggle_control, NULL, menu_check_control, (void*)"UseDefaultColorPicker"));
1067 // For Imprudence 1.3 - need to XUIfy 1067 // For Imprudence 1.3 - need to XUIfy (or remove to advance our marxist schemes!)
1068 menu->append(new LLMenuItemCheckGL("Show search panel in overlay bar", menu_toggle_control, NULL, menu_check_control, (void*)"ShowSearchBar")); 1068 menu->append(new LLMenuItemCheckGL("Show search panel in overlay bar", menu_toggle_control, NULL, menu_check_control, (void*)"ShowSearchBar"));
1069 menu->appendSeparator(); 1069 menu->appendSeparator();
1070 1070
@@ -1409,17 +1409,14 @@ void init_debug_avatar_menu(LLMenuGL* menu)
1409 //menu->append(new LLMenuItemToggleGL("Show Attachment Points", &LLVOAvatar::sShowAttachmentPoints)); 1409 //menu->append(new LLMenuItemToggleGL("Show Attachment Points", &LLVOAvatar::sShowAttachmentPoints));
1410 //diabling collision plane due to DEV-14477 -brad 1410 //diabling collision plane due to DEV-14477 -brad
1411 //menu->append(new LLMenuItemToggleGL("Show Collision Plane", &LLVOAvatar::sShowFootPlane)); 1411 //menu->append(new LLMenuItemToggleGL("Show Collision Plane", &LLVOAvatar::sShowFootPlane));
1412 // For Imprudence 1.3 - need to XUIfy
1413 menu->append(new LLMenuItemCheckGL("Show Collision Skeleton", 1412 menu->append(new LLMenuItemCheckGL("Show Collision Skeleton",
1414 &LLPipeline::toggleRenderDebug, NULL, 1413 &LLPipeline::toggleRenderDebug, NULL,
1415 &LLPipeline::toggleRenderDebugControl, 1414 &LLPipeline::toggleRenderDebugControl,
1416 (void*)LLPipeline::RENDER_DEBUG_AVATAR_VOLUME)); 1415 (void*)LLPipeline::RENDER_DEBUG_AVATAR_VOLUME));
1417 // For Imprudence 1.3 - need to XUIfy
1418 menu->append(new LLMenuItemCheckGL("Display Agent Target", 1416 menu->append(new LLMenuItemCheckGL("Display Agent Target",
1419 &LLPipeline::toggleRenderDebug, NULL, 1417 &LLPipeline::toggleRenderDebug, NULL,
1420 &LLPipeline::toggleRenderDebugControl, 1418 &LLPipeline::toggleRenderDebugControl,
1421 (void*)LLPipeline::RENDER_DEBUG_AGENT_TARGET)); 1419 (void*)LLPipeline::RENDER_DEBUG_AGENT_TARGET));
1422 // For Imprudence 1.3 - need to XUIfy
1423 menu->append(new LLMenuItemToggleGL( "Debug Rotation", &LLVOAvatar::sDebugAvatarRotation)); 1420 menu->append(new LLMenuItemToggleGL( "Debug Rotation", &LLVOAvatar::sDebugAvatarRotation));
1424 menu->append(new LLMenuItemCallGL("Dump Attachments", handle_dump_attachments)); 1421 menu->append(new LLMenuItemCallGL("Dump Attachments", handle_dump_attachments));
1425 menu->append(new LLMenuItemCallGL("Refresh Appearance", handle_rebake_textures, NULL, NULL, 'R', MASK_ALT | MASK_CONTROL )); 1422 menu->append(new LLMenuItemCallGL("Refresh Appearance", handle_rebake_textures, NULL, NULL, 'R', MASK_ALT | MASK_CONTROL ));