From 0528bbd5ef37b7d60c639db2c450cca415b6590e Mon Sep 17 00:00:00 2001 From: Robin Cornelius Date: Sat, 1 Oct 2011 22:16:53 +0100 Subject: MOAP Radar patch set --- linden/indra/newview/llviewermenu.cpp | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'linden/indra/newview/llviewermenu.cpp') diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index a83c11b..538adc7 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp @@ -238,6 +238,8 @@ #include "llfloaterteleporthistory.h" #include "slfloatermediafilter.h" +#include "rcmoapradar.h" + using namespace LLVOAvatarDefines; void init_client_menu(LLMenuGL* menu); void init_server_menu(LLMenuGL* menu); @@ -5216,6 +5218,34 @@ class LLViewEnableLastChatter : public view_listener_t } }; +class LLViewToggleRadar: public view_listener_t +{ + bool handleEvent(LLPointer event, const LLSD& userdata) + { + LLFloaterAvatarList::toggle(0); + bool vis = false; + if(LLFloaterAvatarList::getInstance()) + { + vis = (bool)LLFloaterAvatarList::getInstance()->getVisible(); + } + return true; + } +}; + +class LLViewToggleMOAPRadar: public view_listener_t +{ + bool handleEvent(LLPointer event, const LLSD& userdata) + { + LLFloaterMOAPRadar::toggle(0); + bool vis = false; + if(LLFloaterMOAPRadar::getInstance()) + { + vis = (bool)LLFloaterMOAPRadar::getInstance()->getVisible(); + } + return true; + } +}; + class LLEditEnableDeselect : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) @@ -11215,6 +11245,8 @@ void initialize_menus() addMenu(new LLViewEnableMouselook(), "View.EnableMouselook"); addMenu(new LLViewEnableJoystickFlycam(), "View.EnableJoystickFlycam"); addMenu(new LLViewEnableLastChatter(), "View.EnableLastChatter"); + addMenu(new LLViewToggleRadar(), "View.ToggleAvatarList"); + addMenu(new LLViewToggleMOAPRadar(), "View.ToggleMOAPList"); addMenu(new LLViewCheckBuildMode(), "View.CheckBuildMode"); addMenu(new LLViewCheckJoystickFlycam(), "View.CheckJoystickFlycam"); -- cgit v1.1 From 81eb6f3925577cd46f1e9b16e5691dea62618703 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Mon, 8 Apr 2013 04:27:27 +1000 Subject: A little more 64 bit clean now. --- linden/indra/newview/llviewermenu.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'linden/indra/newview/llviewermenu.cpp') diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 538adc7..f10910c 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp @@ -9088,7 +9088,7 @@ class LLAdvancedToggleRenderType : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - U32 render_type = render_type_from_string( userdata.asString() ); + intptr_t render_type = render_type_from_string( userdata.asString() ); if ( render_type != 0 ) { LLPipeline::toggleRenderTypeControl( (void*)render_type ); @@ -9102,7 +9102,7 @@ class LLAdvancedCheckRenderType : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - U32 render_type = render_type_from_string( userdata["data"].asString() ); + intptr_t render_type = render_type_from_string( userdata["data"].asString() ); bool new_value = false; if ( render_type != 0 ) @@ -9168,7 +9168,7 @@ class LLAdvancedToggleFeature : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - U32 feature = feature_from_string( userdata.asString() ); + intptr_t feature = feature_from_string( userdata.asString() ); if ( feature != 0 ) { @@ -9184,7 +9184,7 @@ class LLAdvancedCheckFeature : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - U32 feature = feature_from_string( userdata["data"].asString() ); + intptr_t feature = feature_from_string( userdata["data"].asString() ); bool new_value = false; if ( feature != 0 ) @@ -9290,7 +9290,7 @@ class LLAdvancedToggleInfoDisplay : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - U32 info_display = info_display_from_string( userdata.asString() ); + intptr_t info_display = info_display_from_string( userdata.asString() ); if ( info_display != 0 ) { @@ -9306,7 +9306,7 @@ class LLAdvancedCheckInfoDisplay : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - U32 info_display = info_display_from_string( userdata["data"].asString() ); + intptr_t info_display = info_display_from_string( userdata["data"].asString() ); bool new_value = false; if ( info_display != 0 ) -- cgit v1.1 From 80891912b540ca43601c2cc16942a01c2e0bd68b Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Mon, 8 Apr 2013 05:28:20 +1000 Subject: Even more useless variable deletions. --- linden/indra/newview/llviewermenu.cpp | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'linden/indra/newview/llviewermenu.cpp') diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index f10910c..7fd58db 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp @@ -5223,11 +5223,6 @@ class LLViewToggleRadar: public view_listener_t bool handleEvent(LLPointer event, const LLSD& userdata) { LLFloaterAvatarList::toggle(0); - bool vis = false; - if(LLFloaterAvatarList::getInstance()) - { - vis = (bool)LLFloaterAvatarList::getInstance()->getVisible(); - } return true; } }; @@ -5237,11 +5232,6 @@ class LLViewToggleMOAPRadar: public view_listener_t bool handleEvent(LLPointer event, const LLSD& userdata) { LLFloaterMOAPRadar::toggle(0); - bool vis = false; - if(LLFloaterMOAPRadar::getInstance()) - { - vis = (bool)LLFloaterMOAPRadar::getInstance()->getVisible(); - } return true; } }; @@ -8976,12 +8966,6 @@ class LLAdvancedToggleAssetBrowser: public view_listener_t { //open the floater LLFloaterAssetBrowser::show(0); - - bool vis = false; - if(LLFloaterAssetBrowser::getInstance()) - { - vis = (bool)LLFloaterAssetBrowser::getInstance()->getVisible(); - } return true; } }; -- cgit v1.1 From e0be0f4d1a35d4f3fce701b9895fefbbe5ca459f Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sat, 11 May 2013 21:06:10 +1000 Subject: Fix http://redmine.kokuaviewer.org/issues/944 - Shadow Frustra missing from Advanced Menu > Rendering > Info Display --- linden/indra/newview/llviewermenu.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'linden/indra/newview/llviewermenu.cpp') diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 7fd58db..1ee00d0 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp @@ -1258,7 +1258,6 @@ void init_debug_rendering_menu(LLMenuGL* menu) sub_menu->append(new LLMenuItemCheckGL("Octree", &LLPipeline::toggleRenderDebug, NULL, &LLPipeline::toggleRenderDebugControl, (void*)LLPipeline::RENDER_DEBUG_OCTREE)); - // For Imprudence 1.3 - need to XUIfy sub_menu->append(new LLMenuItemCheckGL("Shadow Frusta", &LLPipeline::toggleRenderDebug, NULL, &LLPipeline::toggleRenderDebugControl, (void*)LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA)); @@ -9263,6 +9262,10 @@ U32 info_display_from_string(std::string info_display) { return LLPipeline::RENDER_DEBUG_SCULPTED; } + else if ("shadow frusta" == info_display) + { + return LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA; + } else { return 0; -- cgit v1.1 From 0d5f83ff72ab0604d06993bce035989804fef1ec Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sat, 25 May 2013 11:59:42 +1000 Subject: Dump hotkeys for obscure debugging stuff, to free them up for other things. --- linden/indra/newview/llviewermenu.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'linden/indra/newview/llviewermenu.cpp') diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 1ee00d0..0f6e5c4 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp @@ -1098,10 +1098,10 @@ void init_debug_ui_menu(LLMenuGL* menu) menu->append(new LLMenuItemCallGL("Editable UI", &edit_ui)); menu->append(new LLMenuItemCallGL( "Dump SelectMgr", &dump_select_mgr)); menu->append(new LLMenuItemCallGL( "Dump Inventory", &dump_inventory)); - menu->append(new LLMenuItemCallGL( "Dump Focus Holder", &handle_dump_focus, NULL, NULL, 'F', MASK_ALT | MASK_CONTROL)); - menu->append(new LLMenuItemCallGL( "Print Selected Object Info", &print_object_info, NULL, NULL, 'P', MASK_CONTROL|MASK_SHIFT )); - menu->append(new LLMenuItemCallGL( "Print Agent Info", &print_agent_nvpairs, NULL, NULL, 'P', MASK_SHIFT )); - menu->append(new LLMenuItemCallGL( "Memory Stats", &output_statistics, NULL, NULL, 'M', MASK_SHIFT | MASK_ALT | MASK_CONTROL)); + menu->append(new LLMenuItemCallGL( "Dump Focus Holder", &handle_dump_focus)); + menu->append(new LLMenuItemCallGL( "Print Selected Object Info", &print_object_info)); + menu->append(new LLMenuItemCallGL( "Print Agent Info", &print_agent_nvpairs)); + menu->append(new LLMenuItemCallGL( "Memory Stats", &output_statistics)); menu->append(new LLMenuItemCheckGL("Double-Click Auto-Pilot", menu_toggle_control, NULL, menu_check_control, (void*)"DoubleClickAutoPilot")); -- cgit v1.1