From 0041d485b1c5a1b18c9d5b2ae016f2c1e5ea6b8e Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 22 Oct 2009 00:21:18 +0000
Subject: Merging revisions 2129-2144 of
 https://svn.aws.productengine.com/secondlife/pe/stable-2 into
 P:\svn\viewer-2.0.0-3, respecting ancestry * Bugs: EXT-1293 EXT-1611 EXT-1613
 EXT-1176 EXT-1724 EXT-1186 EXT-1662 EXT-1760 EXT-1720 * Dev: EXT-1575
 EXT-1770 EXT-1232 EXT-1234

---
 indra/newview/skins/default/textures/textures.xml  |  2 ++
 .../skins/default/xui/en/favorites_bar_button.xml  |  2 +-
 .../skins/default/xui/en/floater_nearby_chat.xml   | 36 ++++++----------------
 .../newview/skins/default/xui/en/menu_landmark.xml |  3 ++
 indra/newview/skins/default/xui/en/menu_place.xml  |  3 ++
 .../default/xui/en/menu_places_gear_landmark.xml   |  3 ++
 .../skins/default/xui/en/panel_edit_profile.xml    |  1 +
 .../skins/default/xui/en/panel_landmarks.xml       |  5 ++-
 .../skins/default/xui/en/panel_navigation_bar.xml  |  2 +-
 .../skins/default/xui/en/panel_notification.xml    |  2 ++
 indra/newview/skins/default/xui/en/strings.xml     | 16 ++++++++++
 11 files changed, 46 insertions(+), 29 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 546a06b93f..eca5130426 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -118,6 +118,8 @@
   <texture name="Icon_Dock_Press" file_name="windows/Icon_Dock_Press.png" preload="true" />
 
   <texture name="Icon_For_Sale" file_name="icons/Icon_For_sale.png" preload="false" />
+  <texture name="Banner_ForSale" file_name="Banner_ForSale.png" preload="false" />
+  <texture name="Banner_YouAreHere" file_name="Banner_YouAreHere.png" preload="false" />
 
   <texture name="Icon_Gear_Background" file_name="windows/Icon_Gear_Background.png" preload="false" />
   <texture name="Icon_Gear_Foreground" file_name="windows/Icon_Gear_Foreground.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
index a8d3f440c3..9cd7056866 100644
--- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml
+++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
@@ -18,6 +18,6 @@
  left="0"
  name="favorites_bar_btn"
  tab_stop="false"
- top="10"
+ top="0"
  use_ellipses="true"
  width="120" />
diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index 6fbfed5f60..90c5463aa7 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -1,47 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater 
- background_opaque="false"
- background_visible="true" 
- bevel_style="in"
- bg_alpha_color="0.3 0.3 0.3 1.0"
+ can_dock="true"
+ can_minimize="true"
+ can_close="true" 
+ center_horiz="true"
  height="300"
  layout="topleft"
  name="nearby_chat"
  help_topic="nearby_chat"
  save_rect="true"
  title="Nearby Chat"
- single_instance="true"
+ save_visibility="true"
  width="320">
-	<panel top="20" width="320" height="30" background_visible="true" background_opaque="false" bg_alpha_color="0.0 0.0 0.0 1.0" name="chat_caption">
-    	<text
-        	width="140" left="25" height="20" follows="left|right|top"
-        	font="SansSerifBigBold" text_color="white" word_wrap="true"
-        	mouse_opaque="true" name="sender_name" >NEARBY CHAT  </text>
-    	<icon top="5" left="250"
-      			width="20" height="20" follows="top|right"
-		      	color="1 1 1 1" enabled="true" image_name="icn_voice-groupfocus.tga"
-      			mouse_opaque="true" name="nearby_speakers_btn"/>
-    	<icon top="5" left="275"
-      		width="20" height="20" follows="top|right"
-      		color="1 1 1 1" enabled="true" image_name="inv_item_landmark_visited.tga"
-      		mouse_opaque="true" name="tearoff_btn"/>
-    	<icon top="5" left="300"
-      		width="15" height="15" follows="top|right"
-      		color="1 1 1 1" enabled="true" image_name="closebox.tga"
-      		name="close_btn"/>
-	</panel>
             <chat_history
              allow_html="true" 
              bg_readonly_color="ChatHistoryBgColor"
              bg_writeable_color="ChatHistoryBgColor"
-             follows="left|top|right"
+             follows="all"
+			 left="0"
+             top="15"
              font="SansSerif"
              layout="topleft"
-			 height="320"
+			 height="280"
              name="chat_history"
              parse_highlights="true" 
              text_color="ChatHistoryTextColor"
              text_readonly_color="ChatHistoryTextColor"
-             width="250"/>
+             width="320"/>
 
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_landmark.xml b/indra/newview/skins/default/xui/en/menu_landmark.xml
index 54a4095967..93b6db222a 100644
--- a/indra/newview/skins/default/xui/en/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/en/menu_landmark.xml
@@ -28,6 +28,9 @@
         <menu_item_call.on_click
          function="Places.OverflowMenu.Action"
          parameter="pick" />
+        <menu_item_call.on_enable
+         function="Places.OverflowMenu.Enable"
+         parameter="can_create_pick" />
     </menu_item_call>
     <menu_item_call
      label="Add to Favorites Bar"
diff --git a/indra/newview/skins/default/xui/en/menu_place.xml b/indra/newview/skins/default/xui/en/menu_place.xml
index 01f62985ca..1b96eb51f0 100644
--- a/indra/newview/skins/default/xui/en/menu_place.xml
+++ b/indra/newview/skins/default/xui/en/menu_place.xml
@@ -20,6 +20,9 @@
         <menu_item_call.on_click
          function="Places.OverflowMenu.Action"
          parameter="pick" />
+        <menu_item_call.on_enable
+         function="Places.OverflowMenu.Enable"
+         parameter="can_create_pick" />
     </menu_item_call>
     <menu_item_separator
      layout="topleft"/>
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 9d2d162270..c60f670fa6 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
@@ -155,5 +155,8 @@
         <on_click
          function="Places.LandmarksGear.Custom.Action"
          parameter="create_pick" />
+        <on_enable
+         function="Places.LandmarksGear.Enable"
+         parameter="create_pick" />
     </menu_item_call>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index 7e78eb8291..b002034a08 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
+ background_visible="true"
  class="edit_profile_panel"
   follows="all"
  height="535"
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index ad452b16a7..c33f68eaf7 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -31,6 +31,7 @@
              left="0"
              mouse_opaque="true"
              name="favorites_list"
+             start_folder="favorite"
              width="380"/>
         </accordion_tab>
         <accordion_tab
@@ -62,6 +63,7 @@
              left="0"
              mouse_opaque="true"
              name="my_inventory_list"
+             start_folder="inventory"
              width="380"/>
         </accordion_tab>
         <accordion_tab
@@ -77,6 +79,7 @@
              left="0"
              mouse_opaque="true"
              name="library_list"
+             start_folder="library"
              width="380"/>
         </accordion_tab>
     </accordion>
@@ -127,7 +130,7 @@
          picture_style="true"
          tool_tip="Add new folder"
          width="18" />
-        <button
+        <dnd_button
          follows="bottom|right"
          height="18"
          image_selected="TrashItem_Press"
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 00100693cc..4e1ea0f490 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -137,6 +137,6 @@
      name="favorite"
      image_drag_indication="Arrow_Down"
      chevron_button_tool_tip="Show more of My Favorites"
-     top="32"
+     bottom="65"
      width="590" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
index 4d890b1d46..9c2829d92d 100644
--- a/indra/newview/skins/default/xui/en/panel_notification.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification.xml
@@ -12,6 +12,7 @@
   width="350">
   <panel
     background_visible="true"
+    bg_alpha_color="0.3 0.3 0.3 0"
     follows="left|right|top"
     height="100"
     label="info_panel"
@@ -70,6 +71,7 @@
   </panel>
   <panel
     background_visible="true"
+    bg_alpha_color="0.3 0.3 0.3 0"
     follows="left|right|bottom"
     height="40"
     label="control_panel"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 39124efabd..a57c9cd97f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2884,6 +2884,22 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	</string>
 
   <!-- IM system messages -->
+  <string name="ringing-im">
+    Joining Voice Chat...
+  </string>
+  <string name="connected-im">
+    Connected, click End Call to hang up
+  </string>
+  <string name="hang_up-im">
+    Left Voice Chat
+  </string>
+  <string name="answering-im">
+    Connecting...
+  </string>
+  <string name="inventory_item_offered-im">
+    Inventory item offered
+  </string>
+
   <string name="only_user_message">
     You are the only user in this session.
   </string>
-- 
cgit v1.2.3