From b423ea58ca2fe4f9be36fa7b3e70017bc7e8368d Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Tue, 10 Nov 2009 01:04:52 +0800
Subject: fix xml function param problem and adding missing settings in
 settings.xml

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 28 +++++-----------------
 1 file changed, 6 insertions(+), 22 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 66c9060b06..dbc9601680 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1932,18 +1932,15 @@
                  function="Advanced.ToggleConsole"
                  parameter="debug" />
             </menu_item_check>
-            <menu_item_check
+            <menu_item_call
              label="Notifications Console"
              layout="topleft"
              name="Notifications"
              shortcut="control|shift|5">
-              <menu_item_check.on_check
-               function="Advanced.CheckConsole"
-               parameter="notifications" />
-              <menu_item_check.on_click
-               function="Floater.Show"
+              <menu_item_call.on_click
+               function="Floater.Toggle"
                parameter="notifications_console" />
-            </menu_item_check>
+            </menu_item_call>
             <menu_item_check
                label="Texture Size Console"
                layout="topleft"
@@ -1994,19 +1991,6 @@
                  function="Advanced.ToggleConsole"
                  parameter="memory view" />
             </menu_item_check>
-            <menu_item_check
-             label="Notifications Console"
-             layout="topleft"
-             name="Notifications"
-             shortcut="control|shift|5"
-             use_mac_ctrl="true">
-                <menu_item_check.on_check
-                 function="Advanced.CheckConsole"
-                 parameter="notifications" />
-                <menu_item_check.on_click
-                 function="Floater.Show"
-                 parameter="notifications_console" />
-            </menu_item_check>
             <menu_item_separator
              layout="topleft" />
             <menu_item_call
@@ -2558,10 +2542,10 @@
              name="Texture Atlas">
               <menu_item_check.on_check
                function="CheckControl"
-               parameter="TextureAtlas" />
+               parameter="EnableTextureAtlas" />
               <menu_item_check.on_click
                function="ToggleControl"
-               parameter="TextureAtlas" />
+               parameter="EnableTextureAtlas" />
             </menu_item_check>
               <menu_item_check
              label="Render Attached Lights"
-- 
cgit v1.2.3


From a9b16734a1690551cc6277dc419dcb8629f4ddd1 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Mon, 9 Nov 2009 19:28:14 +0000
Subject: DEV-41317 DEV-41318: Enabled the Call button in the Profile panel.

I've added a new LLAvatarActions::startCall() method to make it easy
to start a new P2P call. The Resident Profile "Call" button is now
hooked up to this.

I've also put back the "Call" menu in the avatar popup menu and hooked
this up too. While I was there I noticed that the "IM" popup menu code
could all be removed in favor of a call to LLAvatarActions::startIM().
---
 indra/newview/skins/default/xui/en/panel_profile.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index a0055383b1..0f5e96416d 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -294,7 +294,6 @@
          left_pad="5"
          width="45" />
         <button
-         enabled="false"
          follows="bottom|left"
          height="19"
          label="Call"
-- 
cgit v1.2.3


From 17ab5928c2416b4787e03c54307add77217d831e Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Tue, 10 Nov 2009 00:10:44 +0000
Subject: DEV-41317 DEV-42311: Enabled the "Call" button in more side panels.

The various People panels now have Call buttons that work. Currently
we only support single selection of users in lists for P2P voice chat.
Multiple selection for ad-hoc chat is next...
---
 indra/newview/skins/default/xui/en/panel_notes.xml |   1 -
 .../newview/skins/default/xui/en/panel_people.xml  | 210 +++++++--------------
 2 files changed, 71 insertions(+), 140 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index b9c9100ebc..c02dabed2c 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -132,7 +132,6 @@
          left_pad="5"
          width="40" />
         <button
-         enabled="false"
          follows="bottom|left"
          height="19"
          label="Call"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index d6e2aa64fa..15fdd73bdc 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -329,156 +329,88 @@ background_visible="true"
             </panel>
         </panel>
     </tab_container>
-    <layout_stack
-     animate="false"
-     border_size="0"
-     follows="left|right|bottom"
+    <panel
+     follows="bottom|left"
      height="25"
      layout="topleft"
      left="10"
      name="button_bar"
-     orientation="horizontal"
      width="313">
-        <layout_panel
-         default_tab_group="1"
-         follows="left|top"
-         height="25"
-         layout="topleft"
+        <button
+         follows="bottom|left"
+         font="SansSerifSmall"
+         top="4"
          left="0"
-         name="view_profile_btn_panel"
-         top="-25"
-         width="100">
-            <button
-             follows="top|left"
-             font="SansSerifSmall"
-             height="19"
-             label="Profile"
-             layout="topleft"
-             name="view_profile_btn"
-             tool_tip="Show picture, groups, and other residents information"
-             width="100" />
-        </layout_panel>
-        <layout_panel
-         default_tab_group="1"
-         follows="left|top"
          height="19"
+         label="Profile"
          layout="topleft"
-         left="0"
-         min_width="80"
-         name="group_info_btn_panel"
-         width="100">
-            <button
-             follows="top|left"
-             font="SansSerifSmall"
-             height="19"
-             label="Group Profile"
-             layout="topleft"
-             name="group_info_btn"
-             tool_tip="Show group information"
-             width="100" />
-        </layout_panel>
-        <layout_panel
-         default_tab_group="1"
-         follows="left|top"
-         height="25"
-         layout="topleft"
-         left_pad="5"
-         min_width="45"
-         name="chat_btn_panel"
-         top_delta="0"
-         width="100">
-            <button
-             follows="top|left"
-             font="SansSerifSmall"
-             height="19"
-             label="Group Chat"
-             layout="topleft"
-             name="chat_btn"
-             tool_tip="Open chat session"
-             width="100" />
-        </layout_panel>
-        <layout_panel
-         default_tab_group="1"
-         follows="left|top|"
-         height="25"
+         name="view_profile_btn"
+         tool_tip="Show picture, groups, and other residents information"
+         width="70" />
+        <button
+         follows="bottom|left"
+         font="SansSerifSmall"
+         top="4"
+         left_pad="2"
+         height="19"
+         label="IM"
          layout="topleft"
-         left_pad="5"
-         min_width="35"
-         name="im_btn_panel"
-         top_delta="0"
-         width="50">
-            <button
-             follows="top|left"
-             font="SansSerifSmall"
-             height="19"
-             label="IM"
-             layout="topleft"
-             name="im_btn"
-             tool_tip="Open instant message session"
-             width="50" />
-        </layout_panel>
-        <layout_panel
-         default_tab_group="1"
-         follows="left|top|right"
-         height="25"
+         name="im_btn"
+         tool_tip="Open instant message session"
+         width="45" />
+        <button
+         follows="bottom|left"
+         font="SansSerifSmall"
+         top="4"
+         left_pad="2"
+         height="19"
+         label="Call"
          layout="topleft"
-         left_pad="5"
-         min_width="40"
-         name="call_btn_panel"
-         top_delta="0"
-         visible="false"
-         width="40">
-            <button
-             enabled="false"
-             follows="top|left"
-             font="SansSerifSmall"
-             height="19"
-             label="Call"
-             layout="topleft"
-             name="call_btn"
-             width="50" />
-        </layout_panel>
-        <layout_panel
-         default_tab_group="1"
+         name="call_btn"
+         tool_tip="Call this resident"
+         width="50" />
+        <button
          follows="left|top"
-         height="25"
+         font="SansSerifSmall"
+         top="4"
+         left_pad="2"
+         height="19"
+         label="Share"
          layout="topleft"
-         left_pad="5"
-         min_width="65"
-         name="teleport_btn_panel"
-         top_delta="0"
-         width="100">
-            <button
-             follows="left|top"
-             font="SansSerifSmall"
-             height="19"
-             label="Teleport"
-             layout="topleft"
-             name="teleport_btn"
-             tool_tip="Offer teleport"
-             width="100" />
-        </layout_panel>
-      <layout_panel
-         default_tab_group="1"
-         enabled="false"
-         follows="left|top"
-         height="25"
+         name="share_btn"
+         width="60" />
+        <button
+         follows="bottom|left"
+         font="SansSerifSmall"
+         top="4"
+         left_pad="2"
+         height="19"
+         label="Teleport"
          layout="topleft"
-         left_pad="5"
-         min_width="50"
-         name="share_btn_panel"
-         top_delta="0"
-         visible="false"
-         width="80">
-            <button
-             enabled="false"
-             follows="top|left"
-             font="SansSerifSmall"
-             height="19"
-             label="Share"
-             layout="topleft"
-             name="share_btn"
-             width="80" />
-        </layout_panel>
-    </layout_stack>
+         name="teleport_btn"
+         tool_tip="Offer teleport"
+         width="75" />
+        <button
+         follows="bottom|left"
+         font="SansSerifSmall"
+         top="4"
+         left="0"
+         height="19"
+         label="Group Profile"
+         layout="topleft"
+         name="group_info_btn"
+         tool_tip="Show group information"
+         width="110" />
+        <button
+         follows="bottom|left"
+         font="SansSerifSmall"
+         top="4"
+         left_pad="2"
+         height="19"
+         label="Group Chat"
+         layout="topleft"
+         name="chat_btn"
+         tool_tip="Open chat session"
+         width="110" />
+    </panel>
 </panel>
-- 
cgit v1.2.3


From 5662a8d126b3dab1100aab014aeaeb1752dba26a Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Tue, 10 Nov 2009 12:07:42 +0800
Subject: DEV-35097 final check in XUI for instances of the nonapproved terms
 "2nd Life", "1st Life", "SLURL"

---
 indra/newview/skins/default/xui/en/floater_preview_texture.xml   | 4 ++--
 indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
index e7abfb075a..52a19ac6b3 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
@@ -109,10 +109,10 @@
     	<combo_item name="Unconstrained" value="Unconstrained">
     		Unconstrained
     	</combo_item>
-   	<combo_item name="1:1" value="1:1" tool_tip="Group insignia or 1st Life profile">
+   	<combo_item name="1:1" value="1:1" tool_tip="Group insignia or Real World profile">
 		1:1
 	</combo_item>
-	<combo_item name="4:3" value="4:3" tool_tip="2nd Life profile">
+	<combo_item name="4:3" value="4:3" tool_tip="[SECOND_LIFE] profile">
 		4:3
 	</combo_item>
 	<combo_item name="10:7" value="10:7" tool_tip="Classifieds and search listings, landmarks">
diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
index 63d1a67d0f..4b8bc8132f 100644
--- a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
@@ -82,7 +82,7 @@
          parameter="copy" />
     </menu_item_call>
     <menu_item_call
-     label="Copy SLURL"
+     label="Copy SLurl"
      layout="topleft"
      name="copy_slurl">
         <on_click
-- 
cgit v1.2.3


From 729e0b125287586f19f862ec5221bf11d9e5fe49 Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Tue, 10 Nov 2009 13:10:15 +0800
Subject: I18N: several nodes in XUI have no name= or a duplicate name=, thus
 cant be localized. Notifications console was listed twice in the
 Develop>Console menu

---
 indra/newview/skins/default/xui/en/menu_viewer.xml             |  2 ++
 indra/newview/skins/default/xui/en/panel_group_roles.xml       |  4 ++--
 .../skins/default/xui/en/panel_media_settings_general.xml      | 10 +++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index df2c2465c5..6ee50f1647 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1994,6 +1994,7 @@
                  function="Advanced.ToggleConsole"
                  parameter="memory view" />
             </menu_item_check>
+<!-- Delete this duplicate menu entry
             <menu_item_check
              label="Notifications Console"
              layout="topleft"
@@ -2007,6 +2008,7 @@
                  function="Floater.Show"
                  parameter="notifications_console" />
             </menu_item_check>
+-->
             <menu_item_separator
              layout="topleft" />
             <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 5ed464bcec..4129d7b448 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -440,7 +440,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          layout="topleft"
          follows="left|top"
          left="0"
-         name="static"
+         name="static4"
          top_pad="5"
          width="295">
             Assigned Roles
@@ -467,7 +467,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          layout="topleft"
          follows="left|top"
          left="0"
-         name="static2"
+         name="static5"
          top_pad="5"
          width="295">
             Allowed Abilities
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index cc47e99c2c..686f4ac1d5 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -16,7 +16,7 @@
    follows="top|left" 
    height="15" 
    left="10" 
-   name="">
+   name="home_label">
     Home URL:
   </text>
   <line_editor 
@@ -49,7 +49,7 @@
    follows="top|left"
    height="15"
    left="164"
-   name="">
+   name="preview_label">
     Preview
   </text>
   
@@ -88,7 +88,7 @@
    follows="top|left" 
    height="15"
    left="10" 
-   name="">
+   name="controls_label">
     Controls:
   </text>
   <combo_box 
@@ -207,7 +207,7 @@
    follows="top|left" 
    height="15" 
    left="30" 
-   name="">
+   name="size_label">
     Size:
   </text>
   
@@ -228,7 +228,7 @@
    name="width_pixels" 
    width="50" />
    
-  <text bottom_delta="0" follows="top|left" height="15" left_delta="60" name="">
+  <text bottom_delta="0" follows="top|left" height="15" left_delta="60" name="X_label">
     X
   </text>
   <spinner bottom_delta="0"
-- 
cgit v1.2.3