From c69131be77b40ee2b0bc39303439c26b44b6a49d Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Fri, 14 Oct 2011 15:26:48 -0700
Subject: EXP-1378 FIX Build tooltip does not match wiki text

---
 indra/newview/skins/default/xui/en/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 04fc5c868c..78e10d207c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3683,7 +3683,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string>
   <string name="Command_Appearance_Tooltip">Change your avatar</string>
   <string name="Command_Avatar_Tooltip">Choose a complete avatar</string>
-  <string name="Command_Build_Tooltip">Building objects and reshaping them</string>
+  <string name="Command_Build_Tooltip">Building objects and reshaping terrain</string>
   <string name="Command_Chat_Tooltip">Chat with people nearby using text</string>
   <string name="Command_Compass_Tooltip">Compass</string>
   <string name="Command_Destinations_Tooltip">Destinations of interest</string>
-- 
cgit v1.2.3


From a0a3790f1c08522a8b8e6fa6fc76eb9fcb0f2120 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Fri, 14 Oct 2011 16:06:29 -0700
Subject: updated chat toast with 10 pixel padding

---
 indra/newview/llnearbychathandler.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index 573985b76e..d39f83875e 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -374,7 +374,7 @@ void LLNearbyChatScreenChannel::arrangeToasts()
 
 	if (!getParent())
 	{
-		// connect to floater snap region to get resize events
+		// connect to floater snap region just to get resize events, we don't care about being a proper widget 
 		floater_snap_region->addChild(this);
 		setFollows(FOLLOWS_ALL);
 	}
@@ -384,11 +384,12 @@ void LLNearbyChatScreenChannel::arrangeToasts()
 
 	LLRect channel_rect;
 	floater_snap_region->localRectToOtherView(floater_snap_region->getLocalRect(), &channel_rect, gFloaterView);
+	channel_rect.mLeft += 10;
 	channel_rect.mRight = channel_rect.mLeft + 300;
 
 	S32 channel_bottom = channel_rect.mBottom;
 
-	S32		bottom = channel_bottom;
+	S32		bottom = channel_bottom + 10;
 	S32		margin = gSavedSettings.getS32("ToastGap");
 
 	//sort active toasts
-- 
cgit v1.2.3


From 9c454b6afacd2ffe07525261b698e77a6b99f4da Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Fri, 14 Oct 2011 16:10:11 -0700
Subject: EXP-1380 FIX Hud attached to avatar can be covered by
 location/favorites bar huds follow ui now

---
 indra/newview/skins/default/xui/en/main_view.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 4d3d431b3a..b4be17e677 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -8,13 +8,6 @@
  tab_stop="false" 
  name="main_view"
  width="1024">
-  <view top="0"
-      follows="all"
-      height="768"
-      left="0"
-      mouse_opaque="false"
-      name="world_view_rect"
-      width="1024"/>
   <layout_stack border_size="0"
                 follows="all"
                 mouse_opaque="false"
@@ -57,6 +50,13 @@
                   tab_stop="false" 
                   name="world_panel"
                   width="1024">
+      <view top="0"
+            follows="all"
+            height="500"
+            left="0"
+            mouse_opaque="false"
+            name="world_view_rect"
+            width="1024"/>
       <panel follows="left|top|right"
              height="19"
              left="0"
-- 
cgit v1.2.3