From cc5d14b431adb5ff7bee057b9f72cb5b1ba022b9 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Fri, 2 May 2014 01:08:18 +0100
Subject: Added explanation text on the right of experience lists in
 Region/Estate floater for ACME-1434

---
 .../default/xui/en/panel_region_experiences.xml    | 51 ++++++++++++++++++++--
 1 file changed, 47 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_region_experiences.xml b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
index 57c87d197f..f586b7b5d9 100644
--- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
@@ -37,31 +37,74 @@
       min_height="100"
       width="530">
       <panel follows="all"
-             width="530"
+             width="330"
              name="panel_trusted"
              class="panel_experience_list_editor"
              filename="panel_experience_list_editor.xml" />
+      <text
+        layout="topleft"
+        name="text_help"
+        length="1"
+        top="20"
+        left_pad="5"
+        width="200"
+        height="200"
+        follows="top|right"
+        word_wrap="true">
+        Trusted Experiences have permission to run on this estate.
+
+Additionally, if the estate does not allow public access, Residents participating in any Trusted Experience may enter the estate and can remain as long as they are in the Experience.
+
+Any Experience may be Trusted.
+      </text>
     </layout_panel>
     <layout_panel
       height="100"
       min_height="100"
       width="530">
       <panel
-        label="SOME LABEL"
-        width="530"
+        width="330"
         name="panel_allowed"
         class="panel_experience_list_editor"
         filename="panel_experience_list_editor.xml"/>
+      <text
+        layout="topleft"
+        name="text_help"
+        length="1"
+        top="20"
+        left_pad="5"
+        width="200"
+        height="200"
+        follows="top|right"
+        word_wrap="true">
+        Allowed Experiences have permission to run on this estate.
+
+Only Experiences that are not Grid-Wide may be Allowed.
+      </text>
     </layout_panel>
     <layout_panel
       height="100"
       min_height="100"
       width="530">
       <panel
-        width="530"
+        width="330"
         name="panel_blocked"
         class="panel_experience_list_editor"
         filename="panel_experience_list_editor.xml"/>
+      <text
+        layout="topleft"
+        name="text_help"
+        length="1"
+        top="20"
+        left_pad="5"
+        width="200"
+        height="200"
+        follows="top|right"
+        word_wrap="true">
+        Blocked Experiences may not run on this estate.
+
+Only Grid-Wide Experiences may be Blocked.
+      </text>
     </layout_panel>
   </layout_stack>
 </panel>
-- 
cgit v1.2.3