diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
5 files changed, 76 insertions, 21 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml index b82fe43e74..a8b4b84ab7 100644 --- a/indra/newview/skins/default/xui/en/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml @@ -273,4 +273,17 @@ <button.commit_callback function="TopObjects.ReturnAll" /> </button> + <button + follows="bottom|left" + height="23" + label="Teleport to selected" + layout="topleft" + left_pad="10" + name="teleport_btn" + enabled="false" + top_delta="0" + width="160"> + <button.commit_callback + function="TopObjects.TeleportToSelected" /> +</button> </floater> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index f72d1f0bf9..51ac3d17ab 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -794,14 +794,36 @@ name="LandShow" tear_off="true"> <menu_item_check - label="Ban Lines" - name="Ban Lines"> + label="Hide Ban Lines" + name="Hide Ban Lines"> <menu_item_check.on_check - control="ShowBanLines" /> + function="World.CheckBanLines" + parameter="0" /> <menu_item_check.on_click - function="ToggleControl" - parameter="ShowBanLines" /> + function="World.ShowBanLines" + parameter="0" /> + </menu_item_check> + <menu_item_check + label="Show Ban Lines On Collision" + name="Show Ban Lines On Collision"> + <menu_item_check.on_check + function="World.CheckBanLines" + parameter="1" /> + <menu_item_check.on_click + function="World.ShowBanLines" + parameter="1" /> + </menu_item_check> + <menu_item_check + label="Show Ban Lines On Proximity" + name="Show Ban Lines On Proximity"> + <menu_item_check.on_check + function="World.CheckBanLines" + parameter="2" /> + <menu_item_check.on_click + function="World.ShowBanLines" + parameter="2" /> </menu_item_check> + <menu_item_separator /> <menu_item_check label="Beacons" name="beacons" @@ -3463,15 +3485,30 @@ function="World.EnvPreset" <menu_item_call.on_click function="Advanced.DumpRegionObjectCache" /> </menu_item_call> - -<menu_item_call - label="Interest List: Full Update" - name="Interest List: Full Update" + <menu_item_check + label="Record Stats to File" + name="Stats Recorder File"> + <menu_item_check.on_check + function="Advanced.CheckStatsRecorder" /> + <menu_item_check.on_click + function="Advanced.ToggleStatsRecorder" /> + </menu_item_check> + <menu_item_check + label="Interest Lists 360 Mode" + name="Interest List: 360 Mode" shortcut="alt|shift|I"> - <menu_item_call.on_click - function="Advanced.InterestListFullUpdate" /> - </menu_item_call> - </menu> + <menu_item_check.on_check + function="Advanced.CheckInterestList360Mode" /> + <menu_item_check.on_click + function="Advanced.ToggleInterestList360Mode" /> + </menu_item_check> + <menu_item_call + label="Reset Interest Lists" + name="Reset Interest Lists"> + <menu_item_call.on_click + function="Advanced.ResetInterestLists" /> + </menu_item_call> + </menu> <menu create_jump_keys="true" label="UI" diff --git a/indra/newview/skins/default/xui/en/panel_script_experience.xml b/indra/newview/skins/default/xui/en/panel_script_experience.xml index e798638751..9ae5b201a6 100644 --- a/indra/newview/skins/default/xui/en/panel_script_experience.xml +++ b/indra/newview/skins/default/xui/en/panel_script_experience.xml @@ -48,23 +48,28 @@ layout="topleft" visible="false"> <layout_panel width="120" - height="140"> - <text > + height="140" + name="xp_layout_panel"> + <text name="lbl_script"> Script: </text> - <text bottom_delta="25"> + <text bottom_delta="25" + name="lbl_associated"> Associated with: </text> - <text bottom_delta="25"> + <text bottom_delta="25" + name="lbl_contribute"> You can contribute: </text> - <text bottom_delta="25"> + <text bottom_delta="25" + name="lbl_associate"> Associate with: </text> </layout_panel> <layout_panel width="250" - height="140"> + height="140" + name="xp_choose_panel"> <text > EasySit Animator 1.2.4 </text> diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml index 5647fd27db..fa2d4dfe73 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml @@ -319,7 +319,7 @@ Maximum Altitude: </text> <slider - decimal_digits="1" + decimal_digits="2" follows="left|top" height="16" increment="0.01" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 01f5b513c7..0b19ad1473 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -233,7 +233,7 @@ If you feel this is an error, please contact support@secondlife.com</string> <string name="TooltipForSaleL$">For Sale: L$[AMOUNT]</string> <!-- L$ version --> <string name="TooltipFlagGroupBuild">Group Build</string> <string name="TooltipFlagNoBuild">No Build</string> - <string name="TooltipFlagNoEdit">Group Build</string> + <string name="TooltipFlagNoEdit">No Edit</string> <string name="TooltipFlagNotSafe">Not Safe</string><!-- damage area --> <string name="TooltipFlagNoFly">No Fly</string> <string name="TooltipFlagGroupScripts">Group Scripts</string> |