Second Life viewer sources 1.22.3-RC

8 files changed, 64 insertions, 25 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index ab323e7..88fad82 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -1402,7 +1402,29 @@ chat, or interact with the world.
                         Cancel
                 </option>
         </alert>
-        <alert modal="true" name="InvalidUUID">
+    <alert modal="true" name="EjectAvatarNoBan">
+        <message name="message">
+            Eject this avatar from your land?
+        </message>
+        <option name="Eject">
+            Eject
+        </option>
+        <option name="Cancel">
+            Cancel
+        </option>
+    </alert>
+    <alert modal="true" name="EjectAvatarFullnameNoBan">
+        <message name="message">
+            Eject [AVATAR_NAME] from your land?
+        </message>
+        <option name="Eject">
+            Eject
+        </option>
+        <option name="Cancel">
+            Cancel
+        </option>
+    </alert>
+    <alert modal="true" name="InvalidUUID">
                 <message name="message">
                         Not a valid UUID.
                 </message>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
index f925abd..4038f4f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
@@ -182,8 +182,8 @@
              name="playback_slider" right="290" show_text="false" />
         <text bottom="250" follows="top|left" left="10" name="bad_animation_text">
                 Unable to read animation file.
-        
-        We recommend BVH files exported from Poser 4.
+
+We recommend BVH files exported from Poser 4.
         </text>
         <button bottom="10" follows="bottom|right" height="20" label="Cancel" name="cancel_btn"
              right="290" width="123" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml b/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
index 7b2c6b6..205d199 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
@@ -57,7 +57,7 @@
         </text>

         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

              bottom="-120" drop_shadow_visible="true" follows="left|top"

-             font="SansSerif" h_pad="0" halign="left" height="16" left="85"

+             font="SansSerif" h_pad="0" halign="left" height="16" left="110"

              mouse_opaque="true" name="server_text" right="-10" v_pad="0">

                 Normal

         </text>

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
index 96f48eb..1b60510 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
@@ -14,7 +14,8 @@
                 <column label="Owner" name="owner" width="105" />
                 <column label="Location" name="location" width="130" />
                 <column label="Time" name="time" width="100" />
-        </scroll_list>
+        <column label="Mono Time" name="mono_time" width="55" />
+    </scroll_list>
         <text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
              left="10" name="id_text" width="100">
                 Object ID:
@@ -61,7 +62,10 @@
         <string name="scripts_score_label">
                 Time
         </string>
-        <string name="top_colliders_title">
+    <string name="scripts_mono_time_label">
+        Mono Time
+    </string>
+    <string name="top_colliders_title">
                 Top Colliders
         </string>
         <string name="top_colliders_text">
@@ -70,7 +74,7 @@
         <string name="colliders_score_label">
                 Score
         </string>
-        <string name="none_descriptor">
+    <string name="none_descriptor">
                 None found.
         </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 2728962..4d1f199 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -262,12 +262,14 @@
                 </menu_item_check>
                 <menu_item_check bottom="-132" enabled="true" height="19" label="Local Chat" left="0"
                      mouse_opaque="true" name="Chat History" shortcut="control|H" width="211">
-                     <on_click function="View.Communicate"/>
-                </menu_item_check>
+             <on_click function="ShowFloater" userdata="chat history"/>
+             <on_check function="FloaterVisible" userdata="chat history" />
+        </menu_item_check>
                 <menu_item_check bottom="-151" enabled="true" height="19" label="Communicate" left="0"
                      mouse_opaque="true" name="Instant Message" shortcut="control|T" width="211">
                         <on_click function="View.Communicate"/>
-                </menu_item_check>
+            <on_check function="FloaterVisible" userdata="communicate" />
+        </menu_item_check>
                 <menu_item_call bottom="-170" enabled="true" height="19" label="Inventory" left="0"
                      mouse_opaque="true" name="Inventory" shortcut="control|I" width="211">
                         <on_click function="ShowFloater" userdata="inventory" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
index f6b8838..c504d24 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
@@ -114,6 +114,7 @@ provide information about the group&apos;s finances.
         </text>
         <tab_container border="false" bottom_delta="-189" height="180" left="6" mouse_opaque="false"
              name="group_money_tab_container" tab_position="top" width="406">
+                <!-- Comment out for [DEV-11287]
                 <panel border="true" bottom_delta="-260" follows="left|top|right|bottom" height="255"
                      label="Planning" left="1" mouse_opaque="true"
                      name="group_money_planning_tab" width="398">
@@ -125,6 +126,7 @@ provide information about the group&apos;s finances.
                                 Computing...
                         </text_editor>
                 </panel>
+                -->
                 <panel border="true" bottom_delta="-250" follows="left|top|right|bottom" height="250"
                      label="Details" left="1" mouse_opaque="true" name="group_money_details_tab"
                      width="398">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index f784999..3e21b66 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -161,29 +161,38 @@
                 <combo_item type="string" length="1" enabled="true" name="English" value="en-us">
                         English
                 </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
-                        汉语/漢語 (Chinese) - Beta
+                
+                <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
+                
+                <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
+                        Dansk (Danish) - Beta
                 </combo_item>
                 <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
                         Deutsch (German) - Beta
                 </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
+                        Español (Spanish) - Beta
+                </combo_item>
                 <combo_item type="string" length="1" enabled="true" name="French" value="fr">
                         Français (French) - Beta
                 </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
-                        日本語 (Japanese) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
-                        한국어 (Korean) - Beta
+                <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
+                        Magyar (Hungarian) - Beta
                 </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
-                        Dansk (Danish) - Beta
+                <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
+                        Polski (Polish) - Beta
                 </combo_item>
                 <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
                         Portugués (Portuguese) - Beta
                 </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
-                        Español (Spanish) - Beta
+                <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
+                        汉语/漢語 (Chinese) - Beta
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
+                        日本語 (Japanese) - Beta
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
+                        한국어 (Korean) - Beta
                 </combo_item>
         </combo_box>
         <check_box bottom="-400" enabled="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
index 462728a..91a81df 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
@@ -58,9 +58,9 @@
              left="10" name="top_colliders_btn"
              tool_tip="List of objects experiencing the most potential collisions"
              width="150" />
-        <button bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="18" label="?"
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
              left="170" name="top_colliders_help" width="18" />
-        <button bottom_delta="-20" follows="left|top" height="20" label="Get Top Scripts..."
+        <button bottom_delta="-23" follows="left|top" height="20" label="Get Top Scripts..."
              left="10" name="top_scripts_btn"
              tool_tip="List of objects spending the most time running scripts"
              width="150" />
@@ -69,9 +69,9 @@
         <button bottom_delta="-50" follows="left|top" height="20" label="Restart Region"
              left="10" name="restart_btn"
              tool_tip="Give 2 minute countdown and restart region" width="130" />
-        <button bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="18" label="?"
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
              left="150" name="restart_help" width="18" />
-        <button bottom_delta="-20" follows="left|top" height="20" label="Delay Restart"
+        <button bottom_delta="-23" follows="left|top" height="20" label="Delay Restart"
              left="10" name="cancel_restart_btn"
              tool_tip="Delay region restart by one hour" width="130" />
 </panel>