livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXP-1581 FOLLOWUP Main menu: fixed a typo, removed duplicated items.

master
Vadim ProductEngine 2011-11-24 17:19:36 +02:00
parent 0b7bd115ad
commit fd669e7341
2 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llviewermenu.cpp
View File

@ -7803,24 +7803,6 @@ class LLWorldPostProcess : public view_listener_t
}
};
class LLWorldToggleMovementControls : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
LLFloaterReg::toggleInstanceOrBringToFront("moveview");
return true;
}
};
class LLWorldToggleCameraControls : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
LLFloaterReg::toggleInstanceOrBringToFront("camera");
return true;
}
};
void handle_flush_name_caches()
{
// Toggle display names on and off to flush
@ -8044,9 +8026,6 @@ void initialize_menus()
view_listener_t::addMenu(new LLWorldEnableEnvPreset(), "World.EnableEnvPreset");
view_listener_t::addMenu(new LLWorldPostProcess(), "World.PostProcess");
view_listener_t::addMenu(new LLWorldToggleMovementControls(), "World.Toggle.MovementControls");
view_listener_t::addMenu(new LLWorldToggleCameraControls(), "World.Toggle.CameraControls");
// Tools menu
view_listener_t::addMenu(new LLToolsSelectTool(), "Tools.SelectTool");
view_listener_t::addMenu(new LLToolsSelectOnlyMyObjects(), "Tools.SelectOnlyMyObjects");

20
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -170,7 +170,7 @@
function="BuyCurrency" />
</menu_item_call>
<menu_item_call
label="Accout dashboard..."
label="Account dashboard..."
name="Manage My Account">
<menu_item_call.on_click
function="PromptShowURL"
@ -434,24 +434,6 @@
label="Show"
name="LandShow"
tear_off="true">
<menu_item_check
label="Move Controls"
name="Movement Controls">
<menu_item_check.on_check
function="Floater.Visible"
parameter="moveview" />
<menu_item_check.on_click
function="World.Toggle.MovementControls" />
</menu_item_check>
<menu_item_check
label="View Controls"
name="Camera Controls">
<menu_item_check.on_check
function="Floater.Visible"
parameter="camera" />
<menu_item_check.on_click
function="World.Toggle.CameraControls" />
</menu_item_check>
<menu_item_check
label="Ban Lines"
name="Ban Lines">