Merge tag '6.6.14-release'

source for viewer 6.6.14.581101

8 files changed, 86 insertions, 30 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index d9b0ac0060..684470e0fc 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1114,11 +1114,15 @@
                  label="Open"
                  name="Open"
                  value="Open" />
-				 <combo_box.item
+                <combo_box.item
                  label="Zoom"
                  name="Zoom"
                  value="Zoom" />
                 <combo_box.item
+                 label="Ignore object"
+                 name="Ignoreobject"
+                 value="Ignore" />
+                <combo_box.item
                  label="None"
                  name="None"
                  value="None" />
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_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index c1500d4e7c..425de6cab8 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -75,7 +75,7 @@
      name="remove_friend">
         <menu_item_call.on_click
          function="Avatar.RemoveFriend" />
-        <menu_item_call.on_enable
+        <menu_item_call.on_visible
          function="Avatar.EnableItem"
          parameter="can_delete" />
     </menu_item_call>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f72d1f0bf9..810d3fddd5 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"
@@ -3486,13 +3523,6 @@ function="World.EnvPreset"
              parameter="http://duckduckgo.com"/>
           </menu_item_call>
           <menu_item_call
-           label="FB Connect Test"
-           name="FB Connect Test">
-            <menu_item_call.on_click
-             function="Advanced.WebContentTest"
-             parameter="https://cryptic-ridge-1632.herokuapp.com/"/>
-          </menu_item_call>
-          <menu_item_call
              label="Dump SelectMgr"
              name="Dump SelectMgr">
                 <menu_item_call.on_click
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/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 0b32215964..5f0241512a 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -300,6 +300,10 @@
                  name="Zoom"
                  value="Zoom" />
                 <combo_box.item
+                 label="Ignore object"
+                 name="Ignoreobject"
+                 value="Ignore" />
+                <combo_box.item
                  label="None"
                  name="None"
                  value="None" />
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f71a05a06f..09ccc7b8d2 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>