Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LLViewerMenu code cleanup

Browse Source
This commit is contained in:
Inusaito Sayori
2015-02-02 16:12:32 -05:00
parent 4b7bc99291
commit a9593e62b7
3 changed files with 39 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llviewercontrol.cpp
View File

@@ -625,6 +625,12 @@ static bool handleAllowLargeSounds(const LLSD& newvalue)
return true; return true;
} }
void handleHighResChanged(const LLSD& val)
{
if (val) // High Res Snapshot active, must uncheck RenderUIInSnapshot
gSavedSettings.setBOOL("RenderUIInSnapshot", false);
}
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
void settings_setup_listeners() void settings_setup_listeners()
{ {
@@ -819,6 +825,7 @@ void settings_setup_listeners()
gSavedSettings.getControl("AllowLargeSounds")->getSignal()->connect(boost::bind(&handleAllowLargeSounds, _2)); gSavedSettings.getControl("AllowLargeSounds")->getSignal()->connect(boost::bind(&handleAllowLargeSounds, _2));
gSavedSettings.getControl("LiruUseZQSDKeys")->getSignal()->connect(boost::bind(load_default_bindings, _2)); gSavedSettings.getControl("LiruUseZQSDKeys")->getSignal()->connect(boost::bind(load_default_bindings, _2));
gSavedSettings.getControl("HighResSnapshot")->getSignal()->connect(boost::bind(&handleHighResChanged, _2));
} }
void onCommitControlSetting_gSavedSettings(LLUICtrl* ctrl, void* name) void onCommitControlSetting_gSavedSettings(LLUICtrl* ctrl, void* name)

97
indra/newview/llviewermenu.cpp
View File

@@ -335,10 +335,6 @@ void set_current_pose(std::string anim)
gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_START); gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_START);
gAgent.sendAgentSetAppearance(); gAgent.sendAgentSetAppearance();
} }
void handle_pose_stand(void*)
{
set_current_pose("038fcec9-5ebd-8a8e-0e2e-6e71a0a1ac53");
}
void handle_pose_stand_stop(void*) void handle_pose_stand_stop(void*)
{ {
if (on_pose_stand) if (on_pose_stand)
@@ -349,21 +345,12 @@ void handle_pose_stand_stop(void*)
gAgent.sendAgentSetAppearance(); gAgent.sendAgentSetAppearance();
} }
} }
void cleanup_pose_stand(void) void cleanup_pose_stand()
{ {
handle_pose_stand_stop(NULL); handle_pose_stand_stop(NULL);
} }
void handle_toggle_pose(void* userdata) { BOOL handle_check_pose(void* userdata) { return current_pose.notNull(); }
if(current_pose.isNull())
handle_pose_stand(userdata);
else
handle_pose_stand_stop(userdata);
}
BOOL handle_check_pose(void* userdata) {
return current_pose.notNull();
}
void handle_open_message_log(void*); void handle_open_message_log(void*);
@@ -450,6 +437,7 @@ void handle_morph_load_obj(void*);
void handle_debug_avatar_textures(void*); void handle_debug_avatar_textures(void*);
void handle_dump_region_object_cache(void*); void handle_dump_region_object_cache(void*);
void menu_toggle_double_click_control(void*);
BOOL menu_ui_enabled(void *user_data); BOOL menu_ui_enabled(void *user_data);
BOOL menu_check_control( void* user_data); BOOL menu_check_control( void* user_data);
void menu_toggle_variable( void* user_data ); void menu_toggle_variable( void* user_data );
@@ -1158,11 +1146,11 @@ void init_debug_ui_menu(LLMenuGL* menu)
menu->addChild(new LLMenuItemCallGL( "Print Agent Info", &print_agent_nvpairs, NULL, NULL, 'P', MASK_SHIFT )); menu->addChild(new LLMenuItemCallGL( "Print Agent Info", &print_agent_nvpairs, NULL, NULL, 'P', MASK_SHIFT ));
menu->addChild(new LLMenuItemCallGL( "Memory Stats", &output_statistics, NULL, NULL, 'M', MASK_SHIFT | MASK_ALT | MASK_CONTROL)); menu->addChild(new LLMenuItemCallGL( "Memory Stats", &output_statistics, NULL, NULL, 'M', MASK_SHIFT | MASK_ALT | MASK_CONTROL));
menu->addChild(new LLMenuItemCheckGL("Double-Click Auto-Pilot", menu->addChild(new LLMenuItemCheckGL("Double-Click Auto-Pilot",
menu_toggle_control, NULL, menu_check_control, menu_toggle_double_click_control, NULL, menu_check_control,
(void*)"DoubleClickAutoPilot")); (void*)"DoubleClickAutoPilot"));
// add for double click teleport support // add for double click teleport support
menu->addChild(new LLMenuItemCheckGL("Double-Click Teleport", menu->addChild(new LLMenuItemCheckGL("Double-Click Teleport",
menu_toggle_control, NULL, menu_check_control, menu_toggle_double_click_control, NULL, menu_check_control,
(void*)"DoubleClickTeleport")); (void*)"DoubleClickTeleport"));
menu->addSeparator(); menu->addSeparator();
// menu->addChild(new LLMenuItemCallGL( "Print Packets Lost", &print_packets_lost, NULL, NULL, 'L', MASK_SHIFT )); // menu->addChild(new LLMenuItemCallGL( "Print Packets Lost", &print_packets_lost, NULL, NULL, 'L', MASK_SHIFT ));
@@ -7307,26 +7295,27 @@ BOOL menu_ui_enabled(void *user_data)
} }
// TomY TODO DEPRECATE & REMOVE // TomY TODO DEPRECATE & REMOVE
void menu_toggle_control( void* user_data ) void menu_toggle_control(void* user_data)
{ {
std::string setting(static_cast<char*>(user_data)); std::string setting(static_cast<char*>(user_data));
BOOL checked = gSavedSettings.getBOOL(setting); LLControlVariable* control(gSavedSettings.getControl(setting));
if (setting == "HighResSnapshot" && !checked) control->set(!control->get());
{ }
// High Res Snapshot active, must uncheck RenderUIInSnapshot
gSavedSettings.setBOOL( "RenderUIInSnapshot", FALSE ); void menu_toggle_double_click_control(void* user_data)
} {
else if (setting == "DoubleClickAutoPilot" && !checked) std::string setting(static_cast<char*>(user_data));
{ LLControlVariable* control(gSavedSettings.getControl(setting));
// Doubleclick actions - there can be only one bool checked = control->get();
gSavedSettings.setBOOL( "DoubleClickTeleport", FALSE ); // Doubleclick actions - there can be only one
} if (!checked)
else if (setting == "DoubleClickTeleport" && !checked) {
{ if (setting == "DoubleClickAutoPilot")
// Doubleclick actions - there can be only one gSavedSettings.setBOOL("DoubleClickTeleport", false);
gSavedSettings.setBOOL( "DoubleClickAutoPilot", FALSE ); else if (setting == "DoubleClickTeleport")
} gSavedSettings.setBOOL("DoubleClickAutoPilot", false);
gSavedSettings.setBOOL(setting, !checked); }
control->set(!checked);
} }
@@ -7335,14 +7324,8 @@ class LLToggleControl : public view_listener_t
{ {
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{ {
std::string control_name = userdata.asString(); LLControlVariable* control(gSavedSettings.getControl(userdata.asString()));
BOOL checked = gSavedSettings.getBOOL( control_name ); control->set(!control->get());
if (control_name == "HighResSnapshot" && !checked)
{
// High Res Snapshot active, must uncheck RenderUIInSnapshot
gSavedSettings.setBOOL( "RenderUIInSnapshot", FALSE );
}
gSavedSettings.setBOOL( control_name, !checked );
return true; return true;
} }
}; };
@@ -8789,26 +8772,6 @@ class SinguCloseAllDialogs : public view_listener_t
} }
}; };
class SinguNimble : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
gSavedSettings.setBOOL("Nimble", !gSavedSettings.getBOOL("Nimble"));
return true;
}
};
class SinguCheckNimble : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
gMenuHolder->findControl(userdata["control"].asString())->setValue(gSavedSettings.getBOOL("Nimble"));
return true;
}
};
class SinguEnableStreamingAudioDisplay : public view_listener_t class SinguEnableStreamingAudioDisplay : public view_listener_t
{ {
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -8821,8 +8784,10 @@ class SinguPoseStand : public view_listener_t
{ {
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{ {
handle_toggle_pose(NULL); if (current_pose.isNull())
set_current_pose("038fcec9-5ebd-8a8e-0e2e-6e71a0a1ac53");
else
handle_pose_stand_stop(NULL);
return true; return true;
} }
}; };
@@ -9509,8 +9474,6 @@ void initialize_menus()
// Singularity menu // Singularity menu
addMenu(new SinguCloseAllDialogs(), "CloseAllDialogs"); addMenu(new SinguCloseAllDialogs(), "CloseAllDialogs");
// ---- Fake away handled elsewhere // ---- Fake away handled elsewhere
addMenu(new SinguNimble(), "Nimble");
addMenu(new SinguCheckNimble(), "CheckNimble");
addMenu(new SinguEnableStreamingAudioDisplay(), "EnableStreamingAudioDisplay"); addMenu(new SinguEnableStreamingAudioDisplay(), "EnableStreamingAudioDisplay");
addMenu(new SinguPoseStand(), "PoseStand"); addMenu(new SinguPoseStand(), "PoseStand");
addMenu(new SinguCheckPoseStand(), "CheckPoseStand"); addMenu(new SinguCheckPoseStand(), "CheckPoseStand");

4
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -1031,8 +1031,8 @@
<on_click function="ShowFloater" userdata="ao"/> <on_click function="ShowFloater" userdata="ao"/>
</menu_item_call> </menu_item_call>
<menu_item_check label="Nimble" mouse_opaque="true" name="Nimble"> <menu_item_check label="Nimble" mouse_opaque="true" name="Nimble">
<on_click function="Nimble"/> <on_click function="ToggleControl" userdata="Nimble"/>
<on_check function="CheckNimble"/> <on_check control="Nimble"/>
</menu_item_check> </menu_item_check>
<menu_item_separator mouse_opaque="true" name="separators3"/> <menu_item_separator mouse_opaque="true" name="separators3"/>
<menu_item_check label="Object Area Search" mouse_opaque="true" name="Object Area Search"> <menu_item_check label="Object Area Search" mouse_opaque="true" name="Object Area Search">