diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2a08f62bb46aabb4e9c3f5a34a886715e59dd803..e88bc5a91fd3b3efbacc5cfd9c017fc694ba9c6f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -804,28 +804,6 @@
<key>Value</key>
<real>1.0</real>
</map>
- <key>BuildBtnState</key>
- <map>
- <key>Comment</key>
- <string />
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>BuildBtnEnabled</key>
- <map>
- <key>Comment</key>
- <string />
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>BuildFeathering</key>
<map>
<key>Comment</key>
@@ -2784,17 +2762,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>FirstPersonBtnState</key>
- <map>
- <key>Comment</key>
- <string />
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>FirstRunThisInstall</key>
<map>
<key>Comment</key>
@@ -2966,28 +2933,6 @@
<integer>0</integer>
</array>
</map>
- <key>FlyBtnEnabled</key>
- <map>
- <key>Comment</key>
- <string />
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>FlyBtnState</key>
- <map>
- <key>Comment</key>
- <string />
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>FlycamAbsolute</key>
<map>
<key>Comment</key>
@@ -4600,17 +4545,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>MouselookBtnState</key>
- <map>
- <key>Comment</key>
- <string />
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>MuteAmbient</key>
<map>
<key>Comment</key>
@@ -6552,17 +6486,6 @@
<key>Value</key>
<real>1.0</real>
</map>
- <key>RunBtnState</key>
- <map>
- <key>Comment</key>
- <string />
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>RunMultipleThreads</key>
<map>
<key>Comment</key>
@@ -7386,17 +7309,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>SitBtnState</key>
- <map>
- <key>Comment</key>
- <string />
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>SkinCurrent</key>
<map>
<key>Comment</key>
@@ -7757,17 +7669,6 @@
<key>Value</key>
<integer>2</integer>
</map>
- <key>ThirdPersonBtnState</key>
- <map>
- <key>Comment</key>
- <string />
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
<key>ThrottleBandwidthKBPS</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 214065f08003b1b6c5d76415e739622b30f0cd97..e1747930b0d52d31211458f535793d39c554bd9d 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -795,12 +795,10 @@ void LLAgent::setFlying(BOOL fly)
LLViewerStats::getInstance()->incStat(LLViewerStats::ST_FLY_COUNT);
}
setControlFlags(AGENT_CONTROL_FLY);
- gSavedSettings.setBOOL("FlyBtnState", TRUE);
}
else
{
clearControlFlags(AGENT_CONTROL_FLY);
- gSavedSettings.setBOOL("FlyBtnState", FALSE);
}
@@ -3998,11 +3996,6 @@ void LLAgent::changeCameraToMouselook(BOOL animate)
LLToolMgr::getInstance()->setCurrentToolset(gMouselookToolset);
- gSavedSettings.setBOOL("FirstPersonBtnState", FALSE);
- gSavedSettings.setBOOL("MouselookBtnState", TRUE);
- gSavedSettings.setBOOL("ThirdPersonBtnState", FALSE);
- gSavedSettings.setBOOL("BuildBtnState", FALSE);
-
if (mAvatarObject.notNull())
{
mAvatarObject->stopMotion( ANIM_AGENT_BODY_NOISE );
@@ -4098,11 +4091,6 @@ void LLAgent::changeCameraToFollow(BOOL animate)
mAvatarObject->startMotion( ANIM_AGENT_BREATHE_ROT );
}
- gSavedSettings.setBOOL("FirstPersonBtnState", FALSE);
- gSavedSettings.setBOOL("MouselookBtnState", FALSE);
- gSavedSettings.setBOOL("ThirdPersonBtnState", TRUE);
- gSavedSettings.setBOOL("BuildBtnState", FALSE);
-
// unpause avatar animation
mPauseRequest = NULL;
@@ -4149,11 +4137,6 @@ void LLAgent::changeCameraToThirdPerson(BOOL animate)
mAvatarObject->startMotion( ANIM_AGENT_BREATHE_ROT );
}
- gSavedSettings.setBOOL("FirstPersonBtnState", FALSE);
- gSavedSettings.setBOOL("MouselookBtnState", FALSE);
- gSavedSettings.setBOOL("ThirdPersonBtnState", TRUE);
- gSavedSettings.setBOOL("BuildBtnState", FALSE);
-
LLVector3 at_axis;
// unpause avatar animation
@@ -4231,11 +4214,6 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL camera_ani
LLToolMgr::getInstance()->setCurrentToolset(gFaceEditToolset);
}
- gSavedSettings.setBOOL("FirstPersonBtnState", FALSE);
- gSavedSettings.setBOOL("MouselookBtnState", FALSE);
- gSavedSettings.setBOOL("ThirdPersonBtnState", FALSE);
- gSavedSettings.setBOOL("BuildBtnState", FALSE);
-
if (camera_animate)
{
startCameraAnimation();
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 3d7465f2cbf3be2a2b4213133e80218873ef6d3c..800c55511368e980f5416c622a541b5671681743 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2322,12 +2322,6 @@ void LLAppViewer::cleanupSavedSettings()
{
gSavedSettings.setBOOL("MouseSun", FALSE);
- gSavedSettings.setBOOL("FlyBtnState", FALSE);
-
- gSavedSettings.setBOOL("FirstPersonBtnState", FALSE);
- gSavedSettings.setBOOL("ThirdPersonBtnState", TRUE);
- gSavedSettings.setBOOL("BuildBtnState", FALSE);
-
gSavedSettings.setBOOL("UseEnergy", TRUE); // force toggle to turn off, since sends message to simulator
gSavedSettings.setBOOL("DebugWindowProc", gDebugWindowProc);
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index d05c9cb9a79d8294e4f0e561e0595bf46f59d278..f334344279c8c34a4fd7e5fee3a98f0689f50f1b 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -725,7 +725,7 @@ void LLFloaterTools::onOpen(const LLSD& key)
mTab->selectTabByName(panel);
}
- gMenuBarView->setItemVisible("BuildTools", TRUE);
+ //gMenuBarView->setItemVisible("BuildTools", TRUE);
}
void LLFloaterTools::onClose()
@@ -755,7 +755,7 @@ void LLFloaterTools::onClose()
// so manually reset tool to default (pie menu tool)
LLToolMgr::getInstance()->getCurrentToolset()->selectFirstTool();
- gMenuBarView->setItemVisible("BuildTools", FALSE);
+ //gMenuBarView->setItemVisible("BuildTools", FALSE);
}
void click_popup_info(void*)
diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp
index 5478e0005addc0d8fae3c34a89e3bc49adc8b274..acd6856061c68720112a09c34d7508252a149259 100644
--- a/indra/newview/lltoolbar.cpp
+++ b/indra/newview/lltoolbar.cpp
@@ -250,41 +250,6 @@ void LLToolBar::refresh()
BOOL mouselook = gAgent.cameraMouselook();
setVisible(show && !mouselook);
- BOOL sitting = FALSE;
- if (gAgent.getAvatarObject())
- {
- sitting = gAgent.getAvatarObject()->isSitting();
- }
-
- if (!gAgent.canFly())
- {
- gSavedSettings.setBOOL("FlyBtnEnabled", gAgent.getFlying() ? true : false);
- gSavedSettings.setBOOL("FlyBtnState", false);
- }
- else
- {
- gSavedSettings.setBOOL("FlyBtnEnabled", sitting ? false : true);
- }
-
- // Check to see if we're in build mode
- bool build_enabled = LLToolMgr::getInstance()->canEdit();
- if (build_enabled)
- {
- gSavedSettings.setBOOL("BuildBtnEnabled", true);
- bool build_mode = LLToolMgr::getInstance()->inEdit();
- // HACK: Not in mouselook and not just clicking on a scripted object
- if (gAgent.cameraMouselook() || LLToolGrab::getInstance()->getHideBuildHighlight())
- {
- build_mode = FALSE;
- }
- gSavedSettings.setBOOL("BuildBtnState", build_mode);
- }
- else
- {
- gSavedSettings.setBOOL("BuildBtnEnabled", false);
- gSavedSettings.setBOOL("BuildBtnState", false);
- }
-
if (isInVisibleChain())
{
updateCommunicateList();
diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp
index d52e0b4b800bf8e5beccd1117ebdc18311fd81cb..ded83debad8690eefdfd017c838bd8c98ddbecbd 100644
--- a/indra/newview/lltoolmgr.cpp
+++ b/indra/newview/lltoolmgr.cpp
@@ -317,7 +317,6 @@ bool LLToolMgr::inBuildMode()
// cameraMouselook() actually starts returning true. Also, appearance edit
// sets build mode to true, so let's exclude that.
bool b=(inEdit()
- && gSavedSettings.getBOOL("BuildBtnState")
&& !gAgent.cameraMouselook()
&& mCurrentToolset != gFaceEditToolset);
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 461f7fc1c70fa80363d002aaaec9958e2ccdf3e4..607c5d9ae8801778c3c981589d1ec3a42fb2ce22 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2870,7 +2870,7 @@ void LLViewerWindow::updateLayout()
{
gFloaterTools->setVisible(FALSE);
}
- gMenuBarView->setItemVisible("BuildTools", gFloaterTools->getVisible());
+ //gMenuBarView->setItemVisible("BuildTools", gFloaterTools->getVisible());
}
// Always update console
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 3570ef147cdcf0b0dd05a8fdc9c155aee6e2a88d..6bc12368b7e112093f69ccc508bbd72aae336638 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -229,7 +229,7 @@
function="Floater.Toggle"
parameter="communicate" />
</menu_item_check>
- <menu_item_call
+ <menu_item_call
label="(Temp) Media Remote Ctrl"
layout="topleft"
name="Preferences"
@@ -284,6 +284,44 @@
function="Floater.Show"
parameter="region_info" />
</menu_item_call>
+ <menu
+ create_jump_keys="true"
+ label="Land Options"
+ layout="topleft"
+ name="Land"
+ tear_off="true">
+ <menu_item_check
+ label="Show Property Lines"
+ layout="topleft"
+ name="Property Lines"
+ shortcut="control|alt|shift|P">
+ <menu_item_check.on_check
+ control="ShowPropertyLines" />
+ <menu_item_check.on_click
+ function="ToggleControl"
+ parameter="ShowPropertyLines" />
+ </menu_item_check>
+ <menu_item_check
+ label="Show Land Owners"
+ layout="topleft"
+ name="Land Owners">
+ <menu_item_check.on_check
+ control="ShowParcelOwners" />
+ <menu_item_check.on_click
+ function="ToggleControl"
+ parameter="ShowParcelOwners" />
+ </menu_item_check>
+ <menu_item_check
+ label="Show Ban Lines"
+ layout="topleft"
+ name="Ban Lines">
+ <menu_item_check.on_check
+ control="ShowBanLines" />
+ <menu_item_check.on_click
+ function="ToggleControl"
+ parameter="ShowBanLines" />
+ </menu_item_check>
+ </menu>
<menu_item_separator
layout="topleft" />
<menu
@@ -351,7 +389,7 @@
shortcut="control|shift|M">
<menu_item_check.on_check
function="Floater.Visible"
- parameter="mini_map" />
+ parameter="mini_map" />
<menu_item_check.on_click
function="Floater.Toggle"
parameter="mini_map" />
@@ -369,7 +407,7 @@
</menu_item_call>
<menu_item_separator
layout="topleft" />
- <menu
+ <menu
create_jump_keys="true"
label="Sun Settings"
layout="topleft"
@@ -430,87 +468,78 @@
</menu>
<menu_item_separator
layout="topleft" />
- <menu_item_check
- label="Build"
+ </menu>
+ <menu
+ create_jump_keys="true"
+ label="Build"
+ layout="topleft"
+ name="BuildTools"
+ tear_off="true"
+ visible="true">
+ <menu_item_check
+ label="Show Build Tools"
layout="topleft"
- name="Build"
- shortcut="B">
+ name="Show Build Tools"
+ shortcut="control|B">
<menu_item_check.on_check
function="Build.Active" />
<menu_item_check.on_click
function="Build.Toggle" />
<menu_item_check.on_enable
function="Build.Enabled" />
- </menu_item_check>
- </menu>
- <menu
- label="Help"
- layout="topleft"
- name="Help"
- tear_off="true">
- <menu_item_call
- label="[SECOND_LIFE] Help"
- layout="topleft"
- name="Second Life Help"
- shortcut="F1">
- <menu_item_call.on_click
- function="ShowFloater"
- parameter="help f1" />
- </menu_item_call>
- <menu_item_call
- label="Tutorial"
- layout="topleft"
- name="Tutorial">
- <menu_item_call.on_click
- function="Floater.Show"
- parameter="hud" />
- </menu_item_call>
- <menu_item_check
- label="Show Quick Tips"
- layout="topleft"
- name="Show Quick Tips">
- <menu_item_check.on_check
- function="Help.CheckShowFirstTimeTip" />
- <menu_item_check.on_click
- function="Help.ShowQuickTips" />
- </menu_item_check>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Report Bug..."
- layout="topleft"
- name="ReportBug">
- <menu_item_call.on_click
- function="PromptShowURL"
- name="ReportBug_url"
- parameter="hud,http://help.secondlife.com/en/bugreport/" />
- </menu_item_call>
- <menu_item_call
- label="Report Abuse..."
- layout="topleft"
- name="Report Abuse">
- <menu_item_call.on_click
- function="ShowFloater"
- parameter="complaint reporter" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="About [APP_NAME]"
- layout="topleft"
- name="About Second Life">
- <menu_item_call.on_click
- function="Floater.Show"
- parameter="sl_about" />
- </menu_item_call>
- </menu>
- <menu
- create_jump_keys="true"
- label="Tools"
- layout="topleft"
- name="BuildTools"
- tear_off="true"
- visible="false">
+ </menu_item_check>
+ <menu
+ create_jump_keys="true"
+ label="Select Build Tool"
+ layout="topleft"
+ name="Select Tool"
+ tear_off="true">
+ <menu_item_call
+ label="Focus Tool"
+ layout="topleft"
+ name="Focus"
+ shortcut="control|1">
+ <menu_item_call.on_click
+ function="Tools.SelectTool"
+ parameter="focus" />
+ </menu_item_call>
+ <menu_item_call
+ label="Move Tool"
+ layout="topleft"
+ name="Move"
+ shortcut="control|2">
+ <menu_item_call.on_click
+ function="Tools.SelectTool"
+ parameter="move" />
+ </menu_item_call>
+ <menu_item_call
+ label="Edit Tool"
+ layout="topleft"
+ name="Edit"
+ shortcut="control|3">
+ <menu_item_call.on_click
+ function="Tools.SelectTool"
+ parameter="edit" />
+ </menu_item_call>
+ <menu_item_call
+ label="Create Tool"
+ layout="topleft"
+ name="Create"
+ shortcut="control|4">
+ <menu_item_call.on_click
+ function="Tools.SelectTool"
+ parameter="create" />
+ </menu_item_call>
+ <menu_item_call
+ label="Land Tool"
+ layout="topleft"
+ name="Land"
+ shortcut="control|5">
+ <menu_item_call.on_click
+ function="Tools.SelectTool"
+ parameter="land" />
+ </menu_item_call>
+ </menu>
<menu
create_jump_keys="true"
label="Edit"
@@ -612,6 +641,159 @@
function="Edit.EnableDeselect" />
</menu_item_call>
</menu>
+ <menu_item_separator
+ layout="topleft" />
+ <menu_item_call
+ label="Link"
+ layout="topleft"
+ name="Link"
+ shortcut="control|L">
+ <menu_item_call.on_click
+ function="Tools.Link" />
+ <menu_item_call.on_enable
+ function="Tools.EnableLink" />
+ </menu_item_call>
+ <menu_item_call
+ label="Unlink"
+ layout="topleft"
+ name="Unlink"
+ shortcut="control|shift|L">
+ <menu_item_call.on_click
+ function="Tools.Unlink" />
+ <menu_item_call.on_enable
+ function="Tools.EnableUnlink" />
+ </menu_item_call>
+ <menu_item_separator
+ layout="topleft" />
+ <menu_item_call
+ label="Focus on Selection"
+ layout="topleft"
+ name="Focus on Selection"
+ shortcut="H">
+ <menu_item_call.on_click
+ function="Tools.LookAtSelection"
+ parameter="focus" />
+ <menu_item_call.on_enable
+ function="Tools.SomethingSelectedNoHUD" />
+ </menu_item_call>
+ <menu_item_call
+ label="Zoom to Selection"
+ layout="topleft"
+ name="Zoom to Selection"
+ shortcut="shift|H">
+ <menu_item_call.on_click
+ function="Tools.LookAtSelection"
+ parameter="zoom" />
+ <menu_item_call.on_enable
+ function="Tools.SomethingSelectedNoHUD" />
+ </menu_item_call>
+ <menu_item_separator
+ layout="topleft" />
+ <menu
+ create_jump_keys="true"
+ label="Object"
+ layout="topleft"
+ name="Object"
+ tear_off="true">
+ <menu_item_call
+ label="Buy"
+ layout="topleft"
+ name="Menu Object Take"
+ visible="true">
+ <menu_item_call.on_click
+ function="Tools.BuyOrTake" />
+ <menu_item_call.on_enable
+ function="Tools.EnableBuyOrTake"
+ name="EnableBuyOrTake"
+ parameter="Buy,Take" />
+ </menu_item_call>
+ <menu_item_call
+ label="Take Copy"
+ layout="topleft"
+ name="Take Copy">
+ <menu_item_call.on_click
+ function="Tools.TakeCopy" />
+ <menu_item_call.on_enable
+ function="Tools.EnableTakeCopy" />
+ </menu_item_call>
+ <menu_item_call
+ label="Save Back to My Inventory"
+ layout="topleft"
+ name="Save Object Back to My Inventory">
+ <menu_item_call.on_click
+ function="Tools.SaveToInventory" />
+ <menu_item_call.on_enable
+ function="Tools.EnableSaveToInventory" />
+ </menu_item_call>
+ <menu_item_call
+ label="Save Back to Object Contents"
+ layout="topleft"
+ name="Save Object Back to Object Contents">
+ <menu_item_call.on_click
+ function="Tools.SaveToObjectInventory" />
+ <menu_item_call.on_enable
+ function="Tools.EnableSaveToObjectInventory" />
+ </menu_item_call>
+ </menu>
+ <menu
+ create_jump_keys="true"
+ label="Scripts"
+ layout="topleft"
+ name="Scripts"
+ tear_off="true">
+ <menu_item_call
+ label="Recompile Scripts (Mono)"
+ layout="topleft"
+ name="Mono">
+ <menu_item_call.on_click
+ function="Tools.SelectedScriptAction"
+ parameter="compile mono" />
+ <menu_item_call.on_enable
+ function="EditableSelectedMono" />
+ </menu_item_call>
+ <menu_item_call
+ label="Recompile Scripts (LSL)"
+ layout="topleft"
+ name="LSL">
+ <menu_item_call.on_click
+ function="Tools.SelectedScriptAction"
+ parameter="compile lsl" />
+ <menu_item_call.on_enable
+ function="EditableSelected" />
+ </menu_item_call>
+ <menu_item_call
+ label="Reset Scripts"
+ layout="topleft"
+ name="Reset Scripts">
+ <menu_item_call.on_click
+ function="Tools.SelectedScriptAction"
+ parameter="reset" />
+ <menu_item_call.on_enable
+ function="EditableSelected" />
+ </menu_item_call>
+ <menu_item_call
+ label="Set Scripts to Running"
+ layout="topleft"
+ name="Set Scripts to Running">
+ <menu_item_call.on_click
+ function="Tools.SelectedScriptAction"
+ parameter="start" />
+ <menu_item_call.on_enable
+ function="EditableSelected" />
+ </menu_item_call>
+ <menu_item_call
+ label="Set Scripts to Not Running"
+ layout="topleft"
+ name="Set Scripts to Not Running">
+ <menu_item_call.on_click
+ function="Tools.SelectedScriptAction"
+ parameter="stop" />
+ <menu_item_call.on_enable
+ function="EditableSelected" />
+ </menu_item_call>
+ </menu>
+ <menu_item_separator
+ layout="topleft" />
<menu
create_jump_keys="true"
label="Options"
@@ -800,196 +982,68 @@
parameter="CheesyBeacon" />
</menu_item_check>
</menu>
- <menu
- create_jump_keys="true"
- label="Land"
- layout="topleft"
- name="Land"
- tear_off="true">
- <menu_item_check
- label="Property Lines"
- layout="topleft"
- name="Property Lines"
- shortcut="control|alt|shift|P">
- <menu_item_check.on_check
- control="ShowPropertyLines" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="ShowPropertyLines" />
- </menu_item_check>
- <menu_item_check
- label="Land Owners"
- layout="topleft"
- name="Land Owners">
- <menu_item_check.on_check
- control="ShowParcelOwners" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="ShowParcelOwners" />
- </menu_item_check>
- <menu_item_check
- label="Ban Lines"
- layout="topleft"
- name="Ban Lines">
- <menu_item_check.on_check
- control="ShowBanLines" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="ShowBanLines" />
- </menu_item_check>
- </menu>
</menu>
- <menu
- create_jump_keys="true"
- label="Actions"
+ </menu>
+ <menu
+ label="Help"
+ layout="topleft"
+ name="Help"
+ tear_off="true">
+ <menu_item_call
+ label="[SECOND_LIFE] Help"
layout="topleft"
- name="Actions"
- tear_off="true">
- <menu_item_call
- label="Link"
- layout="topleft"
- name="Link"
- shortcut="control|L">
- <menu_item_call.on_click
- function="Tools.Link" />
- <menu_item_call.on_enable
- function="Tools.EnableLink" />
- </menu_item_call>
- <menu_item_call
- label="Unlink"
- layout="topleft"
- name="Unlink"
- shortcut="control|shift|L">
- <menu_item_call.on_click
- function="Tools.Unlink" />
- <menu_item_call.on_enable
- function="Tools.EnableUnlink" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Focus on Selection"
- layout="topleft"
- name="Focus on Selection"
- shortcut="H">
- <menu_item_call.on_click
- function="Tools.LookAtSelection"
- parameter="focus" />
- <menu_item_call.on_enable
- function="Tools.SomethingSelectedNoHUD" />
- </menu_item_call>
- <menu_item_call
- label="Zoom to Selection"
- layout="topleft"
- name="Zoom to Selection"
- shortcut="shift|H">
- <menu_item_call.on_click
- function="Tools.LookAtSelection"
- parameter="zoom" />
- <menu_item_call.on_enable
- function="Tools.SomethingSelectedNoHUD" />
- </menu_item_call>
- <menu_item_separator
+ name="Second Life Help"
+ shortcut="F1">
+ <menu_item_call.on_click
+ function="ShowFloater"
+ parameter="help f1" />
+ </menu_item_call>
+ <menu_item_call
+ label="Tutorial"
+ layout="topleft"
+ name="Tutorial">
+ <menu_item_call.on_click
+ function="Floater.Show"
+ parameter="hud" />
+ </menu_item_call>
+ <menu_item_check
+ label="Show Quick Tips"
+ layout="topleft"
+ name="Show Quick Tips">
+ <menu_item_check.on_check
+ function="Help.CheckShowFirstTimeTip" />
+ <menu_item_check.on_click
+ function="Help.ShowQuickTips" />
+ </menu_item_check>
+ <menu_item_separator
layout="topleft" />
- <menu_item_call
- label="Buy Object"
- layout="topleft"
- name="Menu Object Take"
- visible="false">
- <menu_item_call.on_click
- function="Tools.BuyOrTake" />
- <menu_item_call.on_enable
- function="Tools.EnableBuyOrTake"
- name="EnableBuyOrTake"
- parameter="Buy,Take" />
- </menu_item_call>
- <menu_item_call
- label="Take Copy"
- layout="topleft"
- name="Take Copy">
- <menu_item_call.on_click
- function="Tools.TakeCopy" />
- <menu_item_call.on_enable
- function="Tools.EnableTakeCopy" />
- </menu_item_call>
- <menu_item_call
- label="Save Object Back to My Inventory"
+ <menu_item_call
+ label="Report Bug..."
layout="topleft"
- name="Save Object Back to My Inventory">
- <menu_item_call.on_click
- function="Tools.SaveToInventory" />
- <menu_item_call.on_enable
- function="Tools.EnableSaveToInventory" />
- </menu_item_call>
- <menu_item_call
- label="Save Object Back to Object Contents"
+ name="ReportBug">
+ <menu_item_call.on_click
+ function="PromptShowURL"
+ name="ReportBug_url"
+ parameter="hud,http://help.secondlife.com/en/bugreport/" />
+ </menu_item_call>
+ <menu_item_call
+ label="Report Abuse..."
layout="topleft"
- name="Save Object Back to Object Contents">
+ name="Report Abuse">
<menu_item_call.on_click
- function="Tools.SaveToObjectInventory" />
- <menu_item_call.on_enable
- function="Tools.EnableSaveToObjectInventory" />
+ function="ShowFloater"
+ parameter="complaint reporter" />
</menu_item_call>
- <menu_item_separator
+ <menu_item_separator
layout="topleft" />
- <menu
- create_jump_keys="true"
- label="Recompile Scripts in Selection"
- layout="topleft"
- name="Recompile Scripts in Selection"
- tear_off="true">
- <menu_item_call
- label="Mono"
- layout="topleft"
- name="Mono">
- <menu_item_call.on_click
- function="Tools.SelectedScriptAction"
- parameter="compile mono" />
- <menu_item_call.on_enable
- function="EditableSelectedMono" />
- </menu_item_call>
- <menu_item_call
- label="LSL"
- layout="topleft"
- name="LSL">
- <menu_item_call.on_click
- function="Tools.SelectedScriptAction"
- parameter="compile lsl" />
- <menu_item_call.on_enable
- function="EditableSelected" />
- </menu_item_call>
- </menu>
- <menu_item_call
- label="Reset Scripts in Selection"
- layout="topleft"
- name="Reset Scripts in Selection">
- <menu_item_call.on_click
- function="Tools.SelectedScriptAction"
- parameter="reset" />
- <menu_item_call.on_enable
- function="EditableSelected" />
- </menu_item_call>
- <menu_item_call
- label="Set Scripts to Running in Selection"
- layout="topleft"
- name="Set Scripts to Running in Selection">
- <menu_item_call.on_click
- function="Tools.SelectedScriptAction"
- parameter="start" />
- <menu_item_call.on_enable
- function="EditableSelected" />
- </menu_item_call>
- <menu_item_call
- label="Set Scripts to Not Running in Selection"
- layout="topleft"
- name="Set Scripts to Not Running in Selection">
- <menu_item_call.on_click
- function="Tools.SelectedScriptAction"
- parameter="stop" />
- <menu_item_call.on_enable
- function="EditableSelected" />
- </menu_item_call>
- </menu>
+ <menu_item_call
+ label="About [APP_NAME]"
+ layout="topleft"
+ name="About Second Life">
+ <menu_item_call.on_click
+ function="Floater.Show"
+ parameter="sl_about" />
+ </menu_item_call>
</menu>
<menu
label="Advanced"
@@ -1035,7 +1089,6 @@
function="World.AlwaysRun" />
</menu_item_check>
<menu_item_check
- control_name="FlyBtnState"
label="Fly"
layout="topleft"
name="Fly"
@@ -1827,7 +1880,7 @@
function="Advanced.ShowDebugSettings"
parameter="all" />
</menu_item_call>
- <menu_item_check
+ <menu_item_check
label="Debug (QA) Mode"
layout="topleft"
name="Debug Mode"
@@ -2496,7 +2549,7 @@
name="Simple Web Browser Test">
<menu_item_call.on_click
function="Floater.Show"
- parameter="html_simple.http://www.secondlife.com" />
+ parameter="html_simple.http://www.secondlife.com" />
</menu_item_call>
<menu_item_call
label="UI/Color Settings"
@@ -2665,7 +2718,7 @@
name="Show Font Test">
<menu_item_call.on_click
function="Floater.Show"
- parameter="font_test" />
+ parameter="font_test" />
</menu_item_call>
<menu_item_call
label="Load from XML..."
@@ -3143,7 +3196,7 @@
name="God Tools">
<menu_item_call.on_click
function="Floater.Show"
- parameter="god_tools" />
+ parameter="god_tools" />
<menu_item_call.on_enable
function="EnableGodCustomerService" />
</menu_item_call>