From 35b4a08ff0485bd6498dc929a99c9fd67da0e089 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Mon, 24 Jan 2011 17:50:12 -0800
Subject: Added new notifications for ER-393 and ER-394

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6f21938bdb..09e35994ad 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4829,6 +4829,20 @@ You don&apos;t have permission to view this notecard.
 Insufficient permissions to rez object.
   </notification>
 
+  <notification
+   icon="notifytip.tga"
+   name="IMAcrossParentEstates"
+   type="notifytip">
+Unable to send IM across parent estates.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="TransferInventoryAcrossParentEstates"
+   type="notifytip">
+Unable to transfer inventory across parent estates.
+  </notification>
+
   <notification
    icon="notifytip.tga"
    name="UnableToLoadNotecard"
-- 
cgit v1.2.3


From e74e0c8da5ecdb107f89bd33de81397ac41f5a5b Mon Sep 17 00:00:00 2001
From: Dave SIMmONs <simon@lindenlab.com>
Date: Tue, 5 Apr 2011 09:07:11 -0700
Subject: ER-671 : Add LLRegionSayTo() LSL function.  Added new chat type for
 direct messages to match server code, use light orange for text.  Reviewed by
 Kelly.

---
 indra/newview/skins/default/colors.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 75aec21f93..d197ab2fdf 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -763,4 +763,7 @@
     <color
      name="MenuBarProjectBgColor"
      reference="MdBlue" />
+    <color
+     name="DirectChatColor"
+     reference="LtOrange" />
 </colors>
-- 
cgit v1.2.3


From 18f5bbfdd3b08e33bc27b787cb4cc1293e2586c8 Mon Sep 17 00:00:00 2001
From: Dave SIMmONs <simon@lindenlab.com>
Date: Tue, 5 Apr 2011 10:33:01 -0700
Subject: ER-671: Add LLRegionSayTo() LSL function.  Added viewer preferences
 color picker under 'Colors' panel for messages sent directly to viewer via
 llRegionSayTo().  Reviewed by Kelly.

---
 .../default/xui/en/panel_preferences_colors.xml    | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 8a37822413..c6d1e38ee7 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -206,6 +206,37 @@
    width="95">
     Errors
   </text>
+  <color_swatch
+   can_apply_immediately="true"
+   color="LtOrange"
+   follows="left|top"
+   height="24"
+   label_height="0"
+   layout="topleft"
+   left="360"
+   name="direct"
+   top_pad="-15"
+   width="44" >
+    <color_swatch.init_callback
+		 function="Pref.getUIColor"
+		 parameter="DirectChatColor" />
+    <color_swatch.commit_callback
+		 function="Pref.applyUIColor"
+		 parameter="DirectChatColor" />
+  </color_swatch>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="10"
+   layout="topleft"
+   left_pad="5"
+   mouse_opaque="false"
+   name="text_box10"
+   top_delta="5"
+   width="95">
+    Direct
+  </text>
   <color_swatch
    can_apply_immediately="true"
    color="LtYellow"
-- 
cgit v1.2.3


From 970b3a7f28c2f1a611410cb8738d17800949b1bd Mon Sep 17 00:00:00 2001
From: Dave SIMmONs <simon@lindenlab.com>
Date: Thu, 21 Apr 2011 11:43:43 -0700
Subject: ER-785:  Missing LSL tooltip strings for llRegionSayTo and llGetEnv. 
 Tooltips are no longer missing.  Reviewed by Kelly.

---
 indra/newview/skins/default/xui/en/strings.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 27295150c5..8ac65cee91 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1830,6 +1830,15 @@ Requests single-word username of an avatar.  When data is available the dataserv
 key llRequestDisplayName(key id)
 Requests name of an avatar.  When data is available the dataserver event will be raised.
 </string>
+<string name="LSLTipText_llRegionSayTo" translate="false">
+llRegionSayTo(key target, integer channel, string msg)
+Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region
+</string>
+<string name="LSLTipText_llGetEnv" translate="false">
+llGetEnv(string name)
+Returns a string with the requested data about the region
+</string>
+
 
   <!-- Avatar busy/away mode -->
 	<string name="AvatarSetNotAway">Not Away</string>
-- 
cgit v1.2.3