diff options
author | Cho <cho@lindenlab.com> | 2014-05-02 01:08:18 +0100 |
---|---|---|
committer | Cho <cho@lindenlab.com> | 2014-05-02 01:08:18 +0100 |
commit | cc5d14b431adb5ff7bee057b9f72cb5b1ba022b9 (patch) | |
tree | e4b54b7cdd44ac7ad47e2845ce4177ae2dc49c0e /indra/newview | |
parent | f45218ff32a20d1bd490fb9dc3951c4986bdd5ca (diff) |
Added explanation text on the right of experience lists in Region/Estate floater for ACME-1434
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_region_experiences.xml | 51 |
1 files changed, 47 insertions, 4 deletions
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> |