From d51bd95a1f9cdeae22f330389c5213a1093eb971 Mon Sep 17 00:00:00 2001
From: "dolphin@dolphin-THINK.home" <dolphin@dolphin-THINK.home>
Date: Tue, 13 Nov 2012 08:24:18 -0800
Subject: Added a simple ui for displaying experiences keys with hardcoded
 contents.

---
 .../skins/default/xui/en/floater_experiences.xml   | 29 ++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |  8 +++
 .../skins/default/xui/en/panel_experience_info.xml | 79 ++++++++++++++++++++++
 .../skins/default/xui/en/panel_experiences.xml     | 40 +++++++++++
 4 files changed, 156 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_experiences.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_experience_info.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_experiences.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experiences.xml b/indra/newview/skins/default/xui/en/floater_experiences.xml
new file mode 100644
index 0000000000..57541c8b35
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_experiences.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<floater
+  positioning="cascading"
+  can_close="true"
+  can_resize="true"
+  height="400"
+  help_topic="sidebar_experiences"
+  min_height="300"
+  min_width="300"
+  layout="topleft"
+  name="floater_experiences"
+  save_rect="false"
+  single_instance="true"
+  reuse_instance="false"
+  title="EXPERIENCES"
+  width="400">
+  <panel
+    top="3"
+    left="3"
+    layout="topleft"
+    right="-3"
+    follows="all"
+    height="300"
+    class="experiences_panel"
+    filename="panel_experiences.xml"
+    >
+  </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1aa55acf2d..36b1cea701 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -52,6 +52,14 @@
          function="Inventory.NewWindow"
          parameter="" />
       </menu_item_call>
+      <menu_item_call
+        label="Experiences..."
+        name="Experiences"
+        shortcut="control|E">
+        <menu_item_call.on_click 
+          function="Floater.ToggleOrBringToFront"
+          parameter="experiences"/>
+      </menu_item_call>
       <menu_item_call
        label="Places..."
        name="Places">
diff --git a/indra/newview/skins/default/xui/en/panel_experience_info.xml b/indra/newview/skins/default/xui/en/panel_experience_info.xml
new file mode 100644
index 0000000000..47f366d857
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_experience_info.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+  bg_opaque_color="DkGray2"
+  background_visible="true"
+  background_opaque="true"
+  fit_parent="true"
+  follows="all"
+  height="120"
+  label="Experiences"
+  layout="topleft"
+  left="0"
+  name="panel_experience_info"
+  top_pad="0">
+  <text
+    follows="top|left|right"
+    font="SansSerifHugeBold"
+    height="26"
+    layout="topleft"
+    left_pad="4"
+    name="title"
+    text_color="White"
+    top="2"
+    value="Experience Info"
+    use_ellipses="true"
+    right="-3"/>
+  <text
+    follows="top|left|right"
+    font="SansSerifBig"
+    height="20"
+    layout="topleft"
+    left_pad="4"
+    name="name_label"
+    text_color="White"
+    left="8"
+    top_delta="28"
+    value="Name"
+    use_ellipses="true"
+    right="-3" />
+  <text
+    follows="top|left|right"
+    font="SansSerif"
+    height="20"
+    layout="topleft"
+    left_pad="8"
+    name="experience_name"
+    text_color="White"
+    left="16"
+    top_delta="22"
+    value="[loading...]"
+    use_ellipses="true"
+    right="-3" />
+  <text
+    follows="top|left|right"
+    font="SansSerifBig"
+    height="20"
+    left="8"
+    layout="topleft"
+    left_pad="4"
+    name="desc_label"
+    text_color="White"
+    top_delta="22"
+    value="Description"
+    use_ellipses="true"
+    right="-3" />
+  <expandable_text
+    follows="top|left|right"
+    font="SansSerif"
+    height="20"
+    layout="topleft"
+    left_pad="8"
+    name="experience_desc"
+    text_color="White"
+    left="16"
+    top_delta="22"
+    value="[loading...]"
+    use_ellipses="true"
+    right="-3"
+    word_wrap="true"  />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_experiences.xml b/indra/newview/skins/default/xui/en/panel_experiences.xml
new file mode 100644
index 0000000000..47a3005aae
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_experiences.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<panel
+  layout="topleft"
+  top="3"
+  left="3"
+  right="-3"
+  bottom="-3"
+  label="Experiences"
+  follows="all">
+  <string
+    name="no_experiences"
+    value="No experiences."/>
+
+  <accordion
+    fit_parent="true"
+    layout="topleft"
+    top="0"
+    left="3"
+    right="-3"
+    bottom="-3"
+    single_expansion="true"
+    follows="all">
+    <accordion_tab
+      name="tab_experiences"
+      layout="topleft"
+      top="0"
+      left="0"
+      right="-3"
+      title="Experiences"
+      follows="all">
+      <flat_list_view
+        name="experiences_list"
+        layout="topleft"
+        top="0"
+        left="0"
+        follows="all"/>
+    </accordion_tab>
+  </accordion>
+</panel>
-- 
cgit v1.2.3


From 596522c7e5a9bff53a56db90597c7bcbcdbf1537 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Tue, 29 Jan 2013 13:58:13 -0800
Subject: Added a combox to the script editor to select an experience. Selected
 experience is sent with the script when saved. The list of experiences is
 currently populated with the avatar's current experience, if any.

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index 765b07ed8b..7e4ac1d7fb 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -204,4 +204,13 @@
      right="400"
      name="Edit_btn"
      width="81" />
+    <combo_box
+      follows="right|bottom"
+      height="23"
+      label="Experience..."
+      layout="topleft"
+      name="Experiences..."
+      width="196"
+      right="487"
+      top_pad="5" />
 </panel>
-- 
cgit v1.2.3


From 2d9ad6ba687cacc81251e1ce57e323b0c2782db9 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Wed, 13 Mar 2013 08:53:51 -0700
Subject: Added group roles for experiences and updated the roles management UI
 to access them.

---
 indra/newview/skins/default/xui/en/role_actions.xml | 12 ++++++++++++
 indra/newview/skins/default/xui/en/strings.xml      |  3 +++
 2 files changed, 15 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml
index 89aef57cca..65acc14b6a 100644
--- a/indra/newview/skins/default/xui/en/role_actions.xml
+++ b/indra/newview/skins/default/xui/en/role_actions.xml
@@ -187,4 +187,16 @@
 		     longdescription="Members in a Role with this Ability can control access and participation in group voice and text chat sessions."
 		     name="moderate group chat" value="37" />
 	</action_set>
+  <action_set
+    description="These Abilities include power to modify experiences owned by this group."
+    name="experience_tools_experience">
+    <action description="Experience Admin"
+            longdescription="Members in a role with this ability can edit the meta-data for an experience."
+            name="experience admin"
+            value ="49" />
+    <action description="Experience Creator"
+            longdescription="Members in a role with this ability can create scripts for an experience."
+            name="experience creator"
+            value ="50" />
+  </action_set>
 </role_actions>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4383b98592..2e1e740d6f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3907,4 +3907,7 @@ Try enclosing path to the editor with double quotes.
   <!-- Spell check settings floater -->
   <string name="UserDictionary">[User]</string>
   
+  <!-- Experience Tools strings -->
+  <string name="experience_tools_experience">Experience</string>
+  
   </strings>
-- 
cgit v1.2.3


From 08a1ae6839f07aeadb58326208c2c01b2ef667c3 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Tue, 6 Aug 2013 16:05:09 -0700
Subject: Checkpoint script editor

---
 .../skins/default/xui/en/panel_script_ed.xml       | 509 ++++++++++++---------
 .../default/xui/en/panel_script_experience.xml     |  97 ++++
 2 files changed, 395 insertions(+), 211 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_script_experience.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index 7e4ac1d7fb..331157d713 100755
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -1,216 +1,303 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- bevel_style="none"
- border_style="line"
- follows="left|top|right|bottom"
- height="522"
- layout="topleft"
- left="0"
- name="script panel"
- width="497">
-    <panel.string
-     name="loading">
-        Loading...
-    </panel.string>
-    <panel.string
-     name="can_not_view">
-        You can not view or edit this script, since it has been set as &quot;no copy&quot;. You need full permissions to view or edit a script inside an object.
-    </panel.string>
-    <panel.string
-     name="public_objects_can_not_run">
-        Public Objects cannot run scripts
-    </panel.string>
-    <panel.string
-     name="script_running">
-        Running
-    </panel.string>
-    <panel.string
-     name="Title">
-        Script: [NAME]
-    </panel.string>
-    <panel.string
-     name="external_editor_not_set">
-        Select an editor by setting the environment variable LL_SCRIPT_EDITOR or the ExternalEditor setting.
-    </panel.string>
-    <menu_bar
-     bg_visible="false"
-     follows="left|top"
-     height="18"
-     layout="topleft"
-     left="0"
-     mouse_opaque="false"
-     name="script_menu"
-     width="476">
-        <menu
-         top="0"
-         height="62"
-         label="File"
-         layout="topleft"
-         left="0"
-         mouse_opaque="false"
-         name="File"
-         width="138">
-            <menu_item_call
-             label="Save"
-             layout="topleft"
-             name="Save" />
-          <menu_item_separator
-           layout="topleft" />
-          <menu_item_call
-           label="Revert All Changes"
-           layout="topleft"
-           name="Revert All Changes" />
-          <menu_item_separator
-           layout="topleft" />
-          <menu_item_call
-           label="Load from file..."
-           layout="topleft"
-           name="LoadFromFile" />
-          <menu_item_call
-           label="Save to file..."
-           layout="topleft"
-           name="SaveToFile" />
-        </menu>
-        <menu
-         top="0"
-         height="198"
-         label="Edit"
-         layout="topleft"
-         mouse_opaque="false"
-         name="Edit"
-         width="139">
-            <menu_item_call
-             enabled="false"
-             label="Undo"
-             layout="topleft"
-             name="Undo" />
-            <menu_item_call
-             enabled="false"
-             label="Redo"
-             layout="topleft"
-             name="Redo" />
-            <menu_item_separator
-             layout="topleft" />
-            <menu_item_call
-             enabled="false"
-             label="Cut"
-             layout="topleft"
-             name="Cut" />
-            <menu_item_call
-             enabled="false"
-             label="Copy"
-             layout="topleft"
-             name="Copy" />
-            <menu_item_call
-             enabled="false"
-             label="Paste"
-             layout="topleft"
-             name="Paste" />
-            <menu_item_separator
-             layout="topleft"
-             name="separator2" />
-            <menu_item_call
-             label="Select All"
-             layout="topleft"
-             name="Select All" />
-            <menu_item_call
-             enabled="false"
-             label="Deselect"
-             layout="topleft"
-             name="Deselect" />
-            <menu_item_separator
-             layout="topleft"
-             name="separator3" />
-            <menu_item_call
-             label="Search / Replace..."
-             layout="topleft"
-             name="Search / Replace..." />
-        </menu>
-        <menu
-         top="0"
-         height="34"
-         label="Help"
-         layout="topleft"
-         mouse_opaque="false"
-         name="Help"
-         width="112">
-            <menu_item_call
-             label="Help..."
-             layout="topleft"
-             name="Help..." />
-            <menu_item_call
-             label="Keyword Help..."
-             layout="topleft"
-             name="Keyword Help..." />
-        </menu>
-    </menu_bar>
-    <text_editor
-    left="0"
-     type="string"
-     length="1"
-     follows="left|top|right|bottom"
-     font="Monospace"
-     height="376"
-     ignore_tab="false"
-     layout="topleft"
-     max_length="65536"
-     name="Script Editor"
-     text_readonly_color="DkGray"
-     width="487"
-     show_line_numbers="true" 
-     enable_tooltip_paste="true"
-     word_wrap="true">
-        Loading...
-    </text_editor>
-    <scroll_list
-    top_pad="10"
+  bevel_style="none"
+  border_style="line"
+  follows="left|top|right|bottom"
+  height="730"
+  layout="topleft"
+  left="0"
+  name="script panel"
+  width="497">
+  <panel.string
+    name="loading">
+    Loading...
+  </panel.string>
+  <panel.string
+    name="can_not_view">
+    You can not view or edit this script, since it has been set as &quot;no copy&quot;. You need full permissions to view or edit a script inside an object.
+  </panel.string>
+  <panel.string
+    name="public_objects_can_not_run">
+    Public Objects cannot run scripts
+  </panel.string>
+  <panel.string
+    name="script_running">
+    Running
+  </panel.string>
+  <panel.string
+    name="Title">
+    Script: [NAME]
+  </panel.string>
+  <panel.string
+    name="external_editor_not_set">
+    Select an editor by setting the environment variable LL_SCRIPT_EDITOR or the ExternalEditor setting.
+  </panel.string>
+  <menu_bar
+    bg_visible="false"
+    follows="left|top"
+    height="18"
+    layout="topleft"
     left="0"
-     follows="left|right|bottom"
-     height="60"
-     layout="topleft"
-     name="lsl errors"
-     width="487" />
-    <text
-     follows="left|bottom"
-     height="12"
-     layout="topleft"
-     left="0"
-     name="line_col"
-     width="128" />
-    <combo_box
-     follows="left|bottom"
-     height="23"
-     label="Insert..."
-     layout="topleft"
-     name="Insert..."
-     width="128" />
-    <button
-     follows="right|bottom"
-     height="23"
-     label="Save"
-     label_selected="Save"
-     layout="topleft"
-     top_pad="-35"
-     right="487"
-     name="Save_btn"
-     width="81" />
-    <button
-     enabled="false"
-     follows="right|bottom"
-     height="23"
-     label="Edit..."
-     layout="topleft"
-     top_pad="-23"
-     right="400"
-     name="Edit_btn"
-     width="81" />
-    <combo_box
-      follows="right|bottom"
-      height="23"
-      label="Experience..."
+    mouse_opaque="false"
+    name="script_menu"
+    width="476">
+    <menu
+      top="0"
+      height="62"
+      label="File"
       layout="topleft"
-      name="Experiences..."
-      width="196"
-      right="487"
-      top_pad="5" />
+      left="0"
+      mouse_opaque="false"
+      name="File"
+      width="138">
+      <menu_item_call
+        label="Save"
+        layout="topleft"
+        name="Save" />
+      <menu_item_separator
+        layout="topleft" />
+      <menu_item_call
+        label="Revert All Changes"
+        layout="topleft"
+        name="Revert All Changes" />
+      <menu_item_separator
+        layout="topleft" />
+      <menu_item_call
+        label="Load from file..."
+        layout="topleft"
+        name="LoadFromFile" />
+      <menu_item_call
+        label="Save to file..."
+        layout="topleft"
+        name="SaveToFile" />
+    </menu>
+    <menu
+      top="0"
+      height="198"
+      label="Edit"
+      layout="topleft"
+      mouse_opaque="false"
+      name="Edit"
+      width="139">
+      <menu_item_call
+        enabled="false"
+        label="Undo"
+        layout="topleft"
+        name="Undo" />
+      <menu_item_call
+        enabled="false"
+        label="Redo"
+        layout="topleft"
+        name="Redo" />
+      <menu_item_separator
+        layout="topleft" />
+      <menu_item_call
+        enabled="false"
+        label="Cut"
+        layout="topleft"
+        name="Cut" />
+      <menu_item_call
+        enabled="false"
+        label="Copy"
+        layout="topleft"
+        name="Copy" />
+      <menu_item_call
+        enabled="false"
+        label="Paste"
+        layout="topleft"
+        name="Paste" />
+      <menu_item_separator
+        layout="topleft"
+        name="separator2" />
+      <menu_item_call
+        label="Select All"
+        layout="topleft"
+        name="Select All" />
+      <menu_item_call
+        enabled="false"
+        label="Deselect"
+        layout="topleft"
+        name="Deselect" />
+      <menu_item_separator
+        layout="topleft"
+        name="separator3" />
+      <menu_item_call
+        label="Search / Replace..."
+        layout="topleft"
+        name="Search / Replace..." />
+    </menu>
+    <menu
+      top="0"
+      height="34"
+      label="Help"
+      layout="topleft"
+      mouse_opaque="false"
+      name="Help"
+      width="112">
+      <menu_item_call
+        label="Help..."
+        layout="topleft"
+        name="Help..." />
+      <menu_item_call
+        label="Keyword Help..."
+        layout="topleft"
+        name="Keyword Help..." />
+    </menu>
+  </menu_bar>
+  <layout_stack width="497"
+                height="700"
+                orientation="vertical"
+                follows="all">
+    <layout_panel auto_resize="true"
+                  height="350"
+                  follows="all"  >
+      <text_editor
+        left="3"
+        type="string"
+        length="1"
+        follows="left|top|right|bottom"
+        font="Monospace"
+        height="376"
+        ignore_tab="false"
+        layout="topleft"
+        max_length="65536"
+        name="Script Editor"
+        text_readonly_color="DkGray"
+        width="482"
+        show_line_numbers="true"
+        enable_tooltip_paste="true"
+        word_wrap="true">
+        Loading...
+      </text_editor>
+    </layout_panel>
+    <layout_panel auto_resize="false"
+                  height="115">
+      <scroll_list
+        top_pad="10"
+        left="3"
+        follows="left|right|bottom"
+        height="60"
+        layout="topleft"
+        name="lsl errors"
+        width="482" />
+      <text
+        follows="left|bottom"
+        height="12"
+        layout="topleft"
+        left="11"
+        name="line_col"
+        width="128" />
+      <combo_box
+        follows="left|bottom"
+        height="23"
+        label="Insert..."
+        layout="topleft"
+        name="Insert..."
+        width="128"
+        left="3"/>
+      <button
+        follows="right|bottom"
+        height="23"
+        label="Save"
+        label_selected="Save"
+        layout="topleft"
+        top_pad="-35"
+        right="485"
+        name="Save_btn"
+        width="81" />
+      <button
+        enabled="false"
+        follows="right|bottom"
+        height="23"
+        label="Edit..."
+        layout="topleft"
+        top_pad="-23"
+        right="400"
+        name="Edit_btn"
+        width="81" />
+    </layout_panel>
+    <layout_panel auto_resize="false"
+                  height="45" width="497">
+      <layout_stack height="45"
+                    width="497"
+                    orientation="horizontal" follows="left|top|right">
+        <layout_panel auto_resize="true"
+                      width="197"
+                      height="45"
+                      follows="let|top|right" left="0">
+          <button name="Expand Experience" 
+                  width="197"
+                  height="35"
+                  is_toggle="true"
+                  tab_stop="false"
+                  pad_left="35"
+                  left="0"
+                  label="Experience"
+                  halign="left"
+                  enabled="false"
+                  handle_right_mouse="false"
+                  follows="top|left|right"
+                  image_unselected="MarketplaceBtn_Off"
+                  image_selected="MarketplaceBtn_Selected">
+          </button>
+        </layout_panel>
+        <layout_panel auto_resize="false" width="150" left="203" follows="top|right">
+          <check_box
+            follows="top|right"
+            height="25"
+            enabled="false"
+            label="Use Experience:"
+            name="enable_xp"/>
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+    <layout_panel  visible="false"
+                   auto_resize="false"
+                   height="65"
+                   name="Experience Details">
+      <layout_stack
+        follows="top|left|right"
+    
+        width="480"
+        height="65"
+        name="xp_details"
+        left="4"
+        top="0"
+        orientation="horizontal"
+        layout="topleft"
+        visible="true">
+        <layout_panel  width="157"
+                       height="65"
+                       auto_resize="false">
+          <text bottom_delta="25">
+            Associate with:
+          </text>
+        </layout_panel>
+
+        <layout_panel width="330"
+                      height="65"
+                      auto_resize="true">
+          <combo_box left="0" 
+                     bottom_delta="33"
+                     label="Choose Experience..."
+                     name="Experiences..."
+                     follows="top|left|right"
+        />
+        </layout_panel>
+      </layout_stack>
+      <text
+        follows="top|left|right"
+        width="497"
+        height="15"
+        bottom_delta="-12"
+        left="0"
+        halign="center"
+        name="No Experiences"
+        visible="true"
+        text_color="AlertCautionTextColor">
+        You are not a contributor to any experiences.
+      </text>
+
+    </layout_panel>
+  </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_script_experience.xml b/indra/newview/skins/default/xui/en/panel_script_experience.xml
new file mode 100644
index 0000000000..e798638751
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_script_experience.xml
@@ -0,0 +1,97 @@
+<panel
+  name="script_experience"
+  title="EXPERIENCE"
+  width="400"
+  follows="top|left|right"
+  top="0"
+  left="0"
+  layout="topleft">
+  <!-- <floater.string name="EXPERIENCE">EXPERIENCE!!!!</floater.string>
+ 
+  <floater.string name="Script:">Script:</floater.string>
+  <floater.string name="Associated with:">Associated with:</floater.string>
+  <floater.string name="You can contribute:">You can contribute:</floater.string>
+  <floater.string name="Associate with:">Associate with:</floater.string>
+  <floater.string name="Yes">Yes</floater.string>
+  <floater.string name="No">No</floater.string>
+  <floater.string name="(none)"></floater.string>
+  <floater.string name="Choose Experience...">Choose Experience...</floater.string>
+  <floater.string name="You are not a contributor to any experiences.">You are not a contributor to any experiences.</floater.string>
+  -->
+  
+  <button name="Expand Experience" width="200"
+          height="35"
+          is_toggle="true"
+          tab_stop="false"
+          pad_left="35"
+          top="0"
+          left="3"
+          label="Experience"
+          halign="left"
+          handle_right_mouse="false"
+          follows="top|left|right"
+          image_unselected="MarketplaceBtn_Off"
+          image_selected="MarketplaceBtn_Selected">
+  </button>
+  <check_box
+	  follows="top|right" height="25" label="Uses Experience" left="215" width="0" top="0" name="enable_xp"
+	  />
+  <layout_stack
+    follows="top|left|right"
+    
+    width="384"
+    height="140"
+    name="xp_details"
+    left="4"
+    top="45"
+    orientation="horizontal"
+    layout="topleft"
+    visible="false">
+    <layout_panel  width="120"
+                   height="140">
+      <text >
+        Script:
+      </text>
+      <text bottom_delta="25">
+        Associated with:
+      </text>
+      <text bottom_delta="25">
+        You can contribute:
+      </text>
+      <text bottom_delta="25">
+        Associate with:
+      </text>
+    </layout_panel>
+
+    <layout_panel width="250"
+                  height="140">
+      <text >
+        EasySit Animator 1.2.4
+      </text>
+      <text bottom_delta="25"
+           text_color="HTMLLinkColor" font.style="UNDERLINE">
+        Kyle's Superhero RPG
+      </text>
+      <text bottom_delta="25">
+        Yes
+      </text>
+      <combo_box left="0" bottom_delta="33"
+                 label="Choose Experience..."
+                 name="Experiences..."
+                 follows="top|left|right"
+        />
+    </layout_panel>
+  </layout_stack>
+  <text
+    follows="top|left|right"
+	  width="400"
+	  height="15"
+	  bottom_delta="-12"
+	  left="0"
+    halign="center"
+    name="No Experiences"
+    visible="false"
+    text_color="AlertCautionTextColor">
+    You are not a contributor to any experiences.
+  </text>
+</panel>
-- 
cgit v1.2.3


From 6354ad379d0850b4cc3969130fb1b30b0e2c0ee9 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Thu, 8 Aug 2013 09:26:09 -0700
Subject: Simplified the experience panel to only the required elements

---
 .../default/xui/en/floater_live_lsleditor.xml      |   2 +-
 .../skins/default/xui/en/panel_script_ed.xml       | 257 ++++++++-------------
 2 files changed, 102 insertions(+), 157 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
index 5cd7cd196d..562936ed80 100755
--- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
@@ -7,7 +7,7 @@
  height="580"
  layout="topleft"
  min_height="271"
- min_width="290"
+ min_width="328"
  name="script ed float"
  help_topic="script_ed_float"
  save_rect="true"
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index 331157d713..18a8ddc1bf 100755
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -3,7 +3,7 @@
   bevel_style="none"
   border_style="line"
   follows="left|top|right|bottom"
-  height="730"
+  height="515"
   layout="topleft"
   left="0"
   name="script panel"
@@ -32,6 +32,18 @@
     name="external_editor_not_set">
     Select an editor by setting the environment variable LL_SCRIPT_EDITOR or the ExternalEditor setting.
   </panel.string>
+  <panel.string
+    name="experience_enabled">
+    Uncheck to remove the current experience
+  </panel.string>
+  <panel.string
+    name="no_experiences">
+    You are not authorized for any experiences
+  </panel.string>
+  <panel.string
+    name="add_experiences">
+    Select to add an experience
+  </panel.string>
   <menu_bar
     bg_visible="false"
     follows="left|top"
@@ -144,160 +156,93 @@
         name="Keyword Help..." />
     </menu>
   </menu_bar>
-  <layout_stack width="497"
-                height="700"
-                orientation="vertical"
-                follows="all">
-    <layout_panel auto_resize="true"
-                  height="350"
-                  follows="all"  >
-      <text_editor
-        left="3"
-        type="string"
-        length="1"
-        follows="left|top|right|bottom"
-        font="Monospace"
-        height="376"
-        ignore_tab="false"
-        layout="topleft"
-        max_length="65536"
-        name="Script Editor"
-        text_readonly_color="DkGray"
-        width="482"
-        show_line_numbers="true"
-        enable_tooltip_paste="true"
-        word_wrap="true">
-        Loading...
-      </text_editor>
-    </layout_panel>
-    <layout_panel auto_resize="false"
-                  height="115">
-      <scroll_list
-        top_pad="10"
-        left="3"
-        follows="left|right|bottom"
-        height="60"
-        layout="topleft"
-        name="lsl errors"
-        width="482" />
-      <text
-        follows="left|bottom"
-        height="12"
-        layout="topleft"
-        left="11"
-        name="line_col"
-        width="128" />
-      <combo_box
-        follows="left|bottom"
-        height="23"
-        label="Insert..."
-        layout="topleft"
-        name="Insert..."
-        width="128"
-        left="3"/>
-      <button
-        follows="right|bottom"
-        height="23"
-        label="Save"
-        label_selected="Save"
-        layout="topleft"
-        top_pad="-35"
-        right="485"
-        name="Save_btn"
-        width="81" />
-      <button
-        enabled="false"
-        follows="right|bottom"
-        height="23"
-        label="Edit..."
-        layout="topleft"
-        top_pad="-23"
-        right="400"
-        name="Edit_btn"
-        width="81" />
-    </layout_panel>
-    <layout_panel auto_resize="false"
-                  height="45" width="497">
-      <layout_stack height="45"
-                    width="497"
-                    orientation="horizontal" follows="left|top|right">
-        <layout_panel auto_resize="true"
-                      width="197"
-                      height="45"
-                      follows="let|top|right" left="0">
-          <button name="Expand Experience" 
-                  width="197"
-                  height="35"
-                  is_toggle="true"
-                  tab_stop="false"
-                  pad_left="35"
-                  left="0"
-                  label="Experience"
-                  halign="left"
-                  enabled="false"
-                  handle_right_mouse="false"
-                  follows="top|left|right"
-                  image_unselected="MarketplaceBtn_Off"
-                  image_selected="MarketplaceBtn_Selected">
-          </button>
-        </layout_panel>
-        <layout_panel auto_resize="false" width="150" left="203" follows="top|right">
-          <check_box
-            follows="top|right"
-            height="25"
-            enabled="false"
-            label="Use Experience:"
-            name="enable_xp"/>
-        </layout_panel>
-      </layout_stack>
-    </layout_panel>
-    <layout_panel  visible="false"
-                   auto_resize="false"
-                   height="65"
-                   name="Experience Details">
-      <layout_stack
-        follows="top|left|right"
-    
-        width="480"
-        height="65"
-        name="xp_details"
-        left="4"
-        top="0"
-        orientation="horizontal"
-        layout="topleft"
-        visible="true">
-        <layout_panel  width="157"
-                       height="65"
-                       auto_resize="false">
-          <text bottom_delta="25">
-            Associate with:
-          </text>
-        </layout_panel>
-
-        <layout_panel width="330"
-                      height="65"
-                      auto_resize="true">
-          <combo_box left="0" 
-                     bottom_delta="33"
-                     label="Choose Experience..."
-                     name="Experiences..."
-                     follows="top|left|right"
-        />
-        </layout_panel>
-      </layout_stack>
-      <text
-        follows="top|left|right"
-        width="497"
-        height="15"
-        bottom_delta="-12"
-        left="0"
-        halign="center"
-        name="No Experiences"
-        visible="true"
-        text_color="AlertCautionTextColor">
-        You are not a contributor to any experiences.
-      </text>
+  <text_editor
+    left="0"
+    type="string"
+    length="1"
+    follows="left|top|right|bottom"
+    font="Monospace"
+    height="346"
+    ignore_tab="false"
+    layout="topleft"
+    max_length="65536"
+    name="Script Editor"
+    text_readonly_color="DkGray"
+    width="482"
+    show_line_numbers="true"
+    enable_tooltip_paste="true"
+    word_wrap="true">
+    Loading...
+  </text_editor>
+  <scroll_list
+    top_pad="10"
+    left="0"
+    follows="left|right|bottom"
+    height="60"
+    layout="topleft"
+    name="lsl errors"
+    width="482" />
+  <text
+    follows="left|bottom"
+    height="12"
+    layout="topleft"
+    left="11"
+    name="line_col"
+    width="128" />
+  <combo_box
+    follows="left|bottom"
+    height="23"
+    label="Insert..."
+    layout="topleft"
+    name="Insert..."
+    width="128"
+    left="0"/>
+  <button
+    follows="right|bottom"
+    height="23"
+    label="Save"
+    label_selected="Save"
+    layout="topleft"
+    top_pad="-35"
+    right="482"
+    name="Save_btn"
+    width="81" />
+  <button
+    enabled="false"
+    follows="right|bottom"
+    height="23"
+    label="Edit..."
+    layout="topleft"
+    top_pad="-23"
+    right="396"
+    name="Edit_btn"
+    width="81" />
+  <check_box width="130"
+             height="21"
+             enabled="false"
+             left="0"
+             top="490"
+             layout="topleft"
+             follows="bottom|left"
+             label="Use Experience:"
+             name="enable_xp"/>
+  <combo_box
+    label=""
+    top_pad="-23"
+    left="135"
+    right="454"
+    layout="topleft"
+    follows="left|bottom|right"
+    visible="false"
+    name="Experiences..."/>
+  <button label="&gt;"
+          name="view_profile"
+          height="23"
+          width="23"
+          right="482"
+          layout="topleft"
+          top_pad="-23"
+          follows="right"
+          visible="false"/>
 
-    </layout_panel>
-  </layout_stack>
 </panel>
-- 
cgit v1.2.3


From 01b363ba52fcdbe4835b067df2d1abe0ea142a9c Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Fri, 9 Aug 2013 08:25:33 -0700
Subject: Removed unused files

---
 .../skins/default/xui/en/panel_experience_info.xml | 197 +++++++++++++++------
 1 file changed, 138 insertions(+), 59 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_experience_info.xml b/indra/newview/skins/default/xui/en/panel_experience_info.xml
index 47f366d857..6df6c2e27d 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_info.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-  bg_opaque_color="DkGray2"
   background_visible="true"
-  background_opaque="true"
-  fit_parent="true"
   follows="all"
-  height="120"
-  label="Experiences"
+  height="570"
   layout="topleft"
   left="0"
-  name="panel_experience_info"
-  top_pad="0">
+  min_height="350"
+  top="0"
+  width="333"
+  name="panel_experience_info">
   <text
     follows="top|left|right"
     font="SansSerifHugeBold"
@@ -22,58 +20,139 @@
     top="2"
     value="Experience Info"
     use_ellipses="true"
+    left="3"
     right="-3"/>
-  <text
-    follows="top|left|right"
-    font="SansSerifBig"
-    height="20"
-    layout="topleft"
-    left_pad="4"
-    name="name_label"
-    text_color="White"
-    left="8"
-    top_delta="28"
-    value="Name"
-    use_ellipses="true"
-    right="-3" />
-  <text
-    follows="top|left|right"
-    font="SansSerif"
-    height="20"
-    layout="topleft"
-    left_pad="8"
-    name="experience_name"
-    text_color="White"
-    left="16"
-    top_delta="22"
-    value="[loading...]"
-    use_ellipses="true"
-    right="-3" />
-  <text
-    follows="top|left|right"
-    font="SansSerifBig"
-    height="20"
-    left="8"
-    layout="topleft"
-    left_pad="4"
-    name="desc_label"
-    text_color="White"
-    top_delta="22"
-    value="Description"
-    use_ellipses="true"
-    right="-3" />
-  <expandable_text
-    follows="top|left|right"
-    font="SansSerif"
-    height="20"
+  <scroll_container
+    color="DkGray2"
+    follows="all"
+    height="532"
     layout="topleft"
-    left_pad="8"
-    name="experience_desc"
-    text_color="White"
-    left="16"
-    top_delta="22"
-    value="[loading...]"
-    use_ellipses="true"
-    right="-3"
-    word_wrap="true"  />
+    left="9"
+    name="xp_scroll"
+    opaque="true"
+    top_pad="10"
+    width="310">
+    <panel
+      bg_alpha_color="DkGray2"
+      follows="left|top|right"
+      height="630"
+      layout="topleft"
+      left="0"
+      min_height="300"
+      name="scrolling_panel"
+      top="0"
+      width="310">
+      <texture_picker
+        enabled="false"
+        fallback_image="default_land_picture.j2c"
+        follows="left|top|right"
+        height="197"
+        layout="topleft"
+        left="11"
+        name="logo"
+        top="10"
+        width="290" />
+      <text
+        follows="left|top|right"
+        font="SansSerifLarge"
+        height="14"
+        layout="topleft"
+        left="10"
+        name="region_title"
+        text_color="white"
+        top_pad="10"
+        use_ellipses="true"
+        value=" Experience Name"
+        width="280"/>
+
+      <expandable_text
+        follows="left|top|right"
+        height="50"
+        layout="topleft"
+        left="10"
+        name="description"
+        top_pad="10"
+        value="It's an experience"
+        width="280" />
+
+      <text
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        left="10"
+        top_pad="10"
+        value="Maturity level:"
+        width="130" />
+      <icon
+        follows="top|left"
+        height="16"
+        image_name="unknown"
+        layout="topleft"
+        left_pad="10"
+        name="maturity_icon"
+        top_pad="-18"
+        width="18" />
+      <text
+        follows="top|left"
+        height="16"
+        layout="topleft"
+        left_pad="5"
+        name="maturity_value"
+        top_pad="-14"
+        value="unknown"
+        width="118" />
+      <panel
+        follows="left|top|right"
+        name="location_panel"
+        left="10"
+        width="280" visible="false"
+        top_pad="10" height="42">
+        <text
+          follows="left|top|right"
+          height="16"
+          layout="topleft"
+          left="00"
+          top="0"
+          value="Location:"
+          width="280" />
+
+        <text
+          follows="left|top|right"
+          height="16"
+          layout="topleft"
+          left="0"
+          top_pad="10"
+          value="Location:"
+          width="280" />
+      </panel>
+
+      <panel
+        follows="left|top|right"
+        name="location_panel"
+        left="10"
+        width="280"
+        top_pad="10"
+        height="42">
+        <text
+          follows="left|top|right"
+          height="16"
+          layout="topleft"
+          left="00"
+          top="0"
+          value="Location:"
+          width="280" />
+
+        <text
+          follows="left|top|right"
+          height="16"
+          layout="topleft"
+          left="0"
+          top_pad="10"
+          value="Location:"
+          width="280" />
+      </panel>
+
+    </panel>
+  </scroll_container>
+
 </panel>
-- 
cgit v1.2.3


From 02b501e4dc9a389878cd323e4f781bc752fec737 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Thu, 15 Aug 2013 09:32:12 -0700
Subject: Move the experience panel to the bottom of the editor floater

---
 .../default/xui/en/floater_live_lsleditor.xml      | 167 ++--
 .../skins/default/xui/en/panel_script_ed.xml       |  41 +-
 .../skins/default/xui/en/sidepanel_item_info.xml   | 889 +++++++++++----------
 3 files changed, 564 insertions(+), 533 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
index 562936ed80..d8c2a753a1 100755
--- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
@@ -1,71 +1,110 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
- bevel_style="none"
- border_style="line"
- can_resize="true"
- height="580"
- layout="topleft"
- min_height="271"
- min_width="328"
- name="script ed float"
- help_topic="script_ed_float"
- save_rect="true"
- title="SCRIPT: NEW SCRIPT"
- width="508">
-    <floater.string
-     name="not_allowed">
-        You can not view or edit this script, since it has been set as &quot;no copy&quot;. You need full permissions to view or edit a script inside an object.
-    </floater.string>
-    <floater.string
-     name="script_running">
-        Running
-    </floater.string>
-    <floater.string
-     name="Title">
-        SCRIPT: [NAME]
-    </floater.string>
-    <panel
-     bevel_style="none"
+  legacy_header_height="18"
+  bevel_style="none"
+  border_style="line"
+  can_resize="true"
+  height="582"
+  layout="topleft"
+  min_height="271"
+  min_width="328"
+  name="script ed float"
+  help_topic="script_ed_float"
+  save_rect="true"
+  title="SCRIPT: NEW SCRIPT"
+  width="508">
+  <floater.string
+    name="not_allowed">
+    You can not view or edit this script, since it has been set as &quot;no copy&quot;. You need full permissions to view or edit a script inside an object.
+  </floater.string>
+  <floater.string
+    name="script_running">
+    Running
+  </floater.string>
+  <floater.string
+    name="Title">
+    SCRIPT: [NAME]
+  </floater.string>
+  <floater.string
+    name="experience_enabled">
+    Uncheck to remove the current experience
+  </floater.string>
+  <floater.string
+    name="no_experiences">
+    You are not authorized for any experiences
+  </floater.string>
+  <floater.string
+    name="add_experiences">
+    Select to add an experience
+  </floater.string>
+  <panel
+    bevel_style="none"
      
-     border_style="line"
-     follows="left|top|right|bottom"
-     height="522"
-     layout="topleft"
-     left="10"
-     name="script ed panel"
-     top="20"
-     width="497" />
-    <button
-     follows="left|bottom"
-     height="23"
-     label="Reset"
-     label_selected="Reset"
-     layout="topleft"
-     name="Reset"
-     left="10"
-     width="85" />
-    <check_box
+    border_style="line"
+    follows="left|top|right|bottom"
+    height="499"
+    layout="topleft"
+    left="10"
+    name="script ed panel"
+    top="16"
+    width="501" />
+  <button
+    follows="left|bottom"
+    height="23"
+    label="Reset"
+    label_selected="Reset"
+    layout="topleft"
+    name="Reset"
+    left="10"
+    width="85" />
+  <check_box
     left_delta="90"
     top_delta="3"
-     enabled="false"
-     follows="left|bottom"
-     font="SansSerif"
-     height="18"
-     initial_value="true"
-     label="Running"
-     layout="topleft"
-     name="running"
-     width="205" />
-    <check_box
+    enabled="false"
+    follows="left|bottom"
+    font="SansSerif"
+    height="18"
+    initial_value="true"
+    label="Running"
+    layout="topleft"
+    name="running"
+    width="205" />
+  <check_box
     left_delta="140"
-     enabled="true"
-     follows="left|bottom"
-     font="SansSerif"
-     height="18"
-     initial_value="true"
-     label="Mono"
-     layout="topleft"
-     name="mono"
-     width="100" />
+    enabled="true"
+    follows="left|bottom"
+    font="SansSerif"
+    height="18"
+    initial_value="true"
+    label="Mono"
+    layout="topleft"
+    name="mono"
+    width="100" />
+  <check_box width="130"
+             height="21"
+             enabled="false"
+             left="9"
+             top_pad="10"
+             layout="topleft"
+             follows="bottom|left"
+             label="Use Experience:"
+             name="enable_xp"/>
+  <combo_box
+    label=""
+    top_pad="-21"
+    left="149"
+    right="467"
+    layout="topleft"
+    follows="left|bottom|right"
+    visible="false"
+    name="Experiences..."/>
+  <button label="&gt;"
+          name="view_profile"
+          height="23"
+          width="23"
+          right="496"
+          layout="topleft"
+          top_pad="-23"
+          follows="right"
+          visible="false"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index 18a8ddc1bf..ed99651a78 100755
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -32,18 +32,6 @@
     name="external_editor_not_set">
     Select an editor by setting the environment variable LL_SCRIPT_EDITOR or the ExternalEditor setting.
   </panel.string>
-  <panel.string
-    name="experience_enabled">
-    Uncheck to remove the current experience
-  </panel.string>
-  <panel.string
-    name="no_experiences">
-    You are not authorized for any experiences
-  </panel.string>
-  <panel.string
-    name="add_experiences">
-    Select to add an experience
-  </panel.string>
   <menu_bar
     bg_visible="false"
     follows="left|top"
@@ -162,7 +150,7 @@
     length="1"
     follows="left|top|right|bottom"
     font="Monospace"
-    height="346"
+    height="369"
     ignore_tab="false"
     layout="topleft"
     max_length="65536"
@@ -217,32 +205,5 @@
     right="396"
     name="Edit_btn"
     width="81" />
-  <check_box width="130"
-             height="21"
-             enabled="false"
-             left="0"
-             top="490"
-             layout="topleft"
-             follows="bottom|left"
-             label="Use Experience:"
-             name="enable_xp"/>
-  <combo_box
-    label=""
-    top_pad="-23"
-    left="135"
-    right="454"
-    layout="topleft"
-    follows="left|bottom|right"
-    visible="false"
-    name="Experiences..."/>
-  <button label="&gt;"
-          name="view_profile"
-          height="23"
-          width="23"
-          right="482"
-          layout="topleft"
-          top_pad="-23"
-          follows="right"
-          visible="false"/>
 
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index c5dfb703e5..c9c19f6d57 100755
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -1,440 +1,471 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-     follows="all"
-	 height="570"
-	 layout="topleft"
-	 name="item properties"
-	 help_topic="item_properties"
-	 title="Item Profile"
-	 width="333">
-	<panel.string
-		 name="unknown">
-        (unknown)
-	</panel.string>
-    <panel.string
-         name="unknown_multiple">
-        (unknown / multiple)
-    </panel.string>
-	<panel.string
-		 name="public">
-        (public)
-    </panel.string>
-	<panel.string
-    	 name="you_can">
-        You can:
-    </panel.string>
-	<panel.string
-    	 name="owner_can">
-        Owner can:
-    </panel.string>
-	<panel.string
-    	 name="acquiredDate">
-        [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
-	</panel.string>
-	<panel.string
-		 name="origin_inventory">
-        (Inventory)
-	</panel.string>
-	<panel.string
-		 name="origin_inworld">
-        (Inworld)
-	</panel.string>
-	<icon
-     	 follows="top|right"
-     	 height="18"
-     	 image_name="Lock"
-	     layout="topleft"
-		 right="-15"
-	     mouse_opaque="true"
-	     name="IconLocked"
-	     top="8"
-	     width="18" />
-    <button
-     follows="top|left"
-     height="24"
-     image_hover_unselected="BackButton_Over"
-     image_pressed="BackButton_Press"
-     image_unselected="BackButton_Off"
-     layout="topleft"
-     left="12"
-     name="back_btn"
-     tab_stop="false"
-     top="2"
-     width="30"
-     use_draw_context_alpha="false" />
-    <text
-     follows="top|left|right"
-     font="SansSerifHugeBold"
-     height="26"
-     layout="topleft"
-     left_pad="3"
-     name="title"
-     text_color="LtGray"
-     top="2"
-     use_ellipses="true"
-     value="Item Profile"
-     width="275" />
-    	    <text
-     follows="top|left|right"
-     height="13"
-     layout="topleft"
-     left="45"
-     name="origin"
-     text_color="LtGray_50"
-     use_ellipses="true"
-     value="(Inventory)"
-     width="275" />
-    <scroll_container
-     color="DkGray2"
-     follows="all"
-     layout="topleft"
-     left="9"
-     name="item_profile_scroll"
-     opaque="true"
-     height="493"
-     width="313"
-     top="45">
-        <panel
-             follows="left|top|right"
-             height="390"
-             help_topic=""
-             label=""
-             layout="topleft"
-             left="0"
-             name="item_profile"
-             top="0"
-             width="295">
-            <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 height="10"
-                 layout="topleft"
-                 left="5"
-                 name="LabelItemNameTitle"
-                 top="10"
-                 width="78">
-                Name:
-            </text>
-            <line_editor
-                 border_style="line"
-                 border_thickness="1"
-                 follows="left|top|right"
-                 height="20"
-                 layout="topleft"
-                 left_delta="78"
-                 max_length_bytes="63"
-                 name="LabelItemName"
-                 top_delta="0"
-                 width="210" />
-            <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 height="10"
-                 layout="topleft"
-                 left="5"
-                 name="LabelItemDescTitle"
-                 top_pad="10"
-                 width="78">
-                Description:
-            </text>
-            <line_editor
-                 border_style="line"
-                 border_thickness="1"
-                 follows="left|top|right"
-                 height="23"
-                 layout="topleft"
-                 left_delta="78"
-                 max_length_bytes="127"
-                 name="LabelItemDesc"
-                 top_delta="-5"
-                 width="210" />
-            <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 height="23"
-                 layout="topleft"
-                 left="5"
-                 name="LabelCreatorTitle"
-              top_pad="10"
-                 width="78">
-                Creator:
-            </text>
-                <avatar_icon
-         follows="top|left"
-         height="20"
-         default_icon_name="Generic_Person"
-         layout="topleft"
-         left_pad="0"
-         top_delta="-6"
-         mouse_opaque="true"
-         width="20" />
-            <text
-                 type="string"
-         follows="left|right|top"
-         font="SansSerifSmall"
-         height="15"
-         layout="topleft"
-         left_pad="5"
-                 name="LabelCreatorName"
-       top_delta="6"
-       use_ellipses="true"
-       width="165">
-          </text>
-          <button
-          follows="top|right"
-          height="16"
+  follows="all"
+  height="570"
+  layout="topleft"
+  name="item properties"
+  help_topic="item_properties"
+  title="Item Profile"
+  width="333">
+  <panel.string
+    name="no_experience">
+    (none)
+  </panel.string>
+  <panel.string
+    name="unknown">
+    (unknown)
+  </panel.string>
+  <panel.string
+    name="unknown_multiple">
+    (unknown / multiple)
+  </panel.string>
+  <panel.string
+    name="public">
+    (public)
+  </panel.string>
+  <panel.string
+    name="you_can">
+    You can:
+  </panel.string>
+  <panel.string
+    name="owner_can">
+    Owner can:
+  </panel.string>
+  <panel.string
+    name="acquiredDate">
+    [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+  </panel.string>
+  <panel.string
+    name="origin_inventory">
+    (Inventory)
+  </panel.string>
+  <panel.string
+    name="origin_inworld">
+    (Inworld)
+  </panel.string>
+  <icon
+    follows="top|right"
+    height="18"
+    image_name="Lock"
+    layout="topleft"
+    right="-15"
+    mouse_opaque="true"
+    name="IconLocked"
+    top="8"
+    width="18" />
+  <button
+    follows="top|left"
+    height="24"
+    image_hover_unselected="BackButton_Over"
+    image_pressed="BackButton_Press"
+    image_unselected="BackButton_Off"
+    layout="topleft"
+    left="12"
+    name="back_btn"
+    tab_stop="false"
+    top="2"
+    width="30"
+    use_draw_context_alpha="false" />
+  <text
+    follows="top|left|right"
+    font="SansSerifHugeBold"
+    height="26"
+    layout="topleft"
+    left_pad="3"
+    name="title"
+    text_color="LtGray"
+    top="2"
+    use_ellipses="true"
+    value="Item Profile"
+    width="275" />
+  <text
+    follows="top|left|right"
+    height="13"
+    layout="topleft"
+    left="45"
+    name="origin"
+    text_color="LtGray_50"
+    use_ellipses="true"
+    value="(Inventory)"
+    width="275" />
+  <scroll_container
+    color="DkGray2"
+    follows="all"
+    layout="topleft"
+    left="9"
+    name="item_profile_scroll"
+    opaque="true"
+    height="493"
+    width="313"
+    top="45">
+    <panel
+      follows="left|top|right"
+      height="390"
+      help_topic=""
+      label=""
+      layout="topleft"
+      left="0"
+      name="item_profile"
+      top="0"
+      width="295">
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left="5"
+        name="LabelItemNameTitle"
+        top="10"
+        width="78">
+        Name:
+      </text>
+      <line_editor
+        border_style="line"
+        border_thickness="1"
+        follows="left|top|right"
+        height="20"
+        layout="topleft"
+        left_delta="78"
+        max_length_bytes="63"
+        name="LabelItemName"
+        top_delta="0"
+        width="210" />
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left="5"
+        name="LabelItemDescTitle"
+        top_pad="10"
+        width="78">
+        Description:
+      </text>
+      <line_editor
+        border_style="line"
+        border_thickness="1"
+        follows="left|top|right"
+        height="23"
+        layout="topleft"
+        left_delta="78"
+        max_length_bytes="127"
+        name="LabelItemDesc"
+        top_delta="-5"
+        width="210" />
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="23"
+        layout="topleft"
+        left="5"
+        name="LabelCreatorTitle"
+        top_pad="10"
+        width="78">
+        Creator:
+      </text>
+      <avatar_icon
+        follows="top|left"
+        height="20"
+        default_icon_name="Generic_Person"
+        layout="topleft"
+        left_pad="0"
+        top_delta="-6"
+        mouse_opaque="true"
+        width="20" />
+      <text
+        type="string"
+        follows="left|right|top"
+        font="SansSerifSmall"
+        height="15"
+        layout="topleft"
+        left_pad="5"
+        name="LabelCreatorName"
+        top_delta="6"
+        use_ellipses="true"
+        width="165">
+      </text>
+      <button
+        follows="top|right"
+        height="16"
+        image_selected="Inspector_I"
+        image_unselected="Inspector_I"
+        layout="topleft"
+        right="-5"
+        name="BtnCreator"
+        top_delta="-6"
+        width="16" />
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="23"
+        layout="topleft"
+        left="5"
+        name="LabelOwnerTitle"
+        top_pad="10"
+        width="78">
+        Owner:
+      </text>
+      <avatar_icon
+        follows="top|left"
+        height="20"
+        default_icon_name="Generic_Person"
+        layout="topleft"
+        left_pad="0"
+        top_delta="-6"
+        mouse_opaque="true"
+        width="20" />
+      <text
+        type="string"
+        follows="left|right|top"
+        font="SansSerifSmall"
+        height="15"
+        layout="topleft"
+        left_pad="5"
+        name="LabelOwnerName"
+        top_delta="6"
+        use_ellipses="true"
+        width="165">
+      </text>
+      <button
+        follows="top|right"
+        height="16"
         image_selected="Inspector_I"
         image_unselected="Inspector_I"
+        layout="topleft"
+        right="-5"
+        name="BtnOwner"
+        top_delta="-3"
+        width="16" />
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="23"
+        layout="topleft"
+        left="5"
+        name="LabelAcquiredTitle"
+        top_pad="10"
+        width="78">
+        Acquired:
+      </text>
+      <text
+        type="string"
+        length="1"
+        follows="left|top|right"
+        height="23"
+        layout="topleft"
+        left_delta="78"
+        name="LabelAcquiredDate"
+        top_delta="0"
+        width="210">
+      </text>
+      <panel
+        border="false"
+        follows="left|top|right"
+        layout="topleft"
+        mouse_opaque="false"
+        name="perms_inv"
+        left="0"
+        top_pad="25"
+        height="155"
+        width="313">
+        <text
+          type="string"
+          length="1"
+          left="10"
+          top_pad="13"
+          text_color="EmphasisColor"
+          height="15"
+          follows="left|top|right"
+          layout="topleft"
+          name="perm_modify"
+          width="200">
+          You can:
+        </text>
+        <check_box
+          height="18"
+          label="Modify"
+          layout="topleft"
+          left="20"
+          name="CheckOwnerModify"
+          top_pad="0"
+          width="90" />
+        <check_box
+          height="18"
+          label="Copy"
+          layout="topleft"
+          left_pad="0"
+          name="CheckOwnerCopy"
+          width="90" />
+        <check_box
+          height="18"
+          label="Transfer"
+          layout="topleft"
+          left_pad="0"
+          name="CheckOwnerTransfer"
+          width="106" />
+        <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="10"
+          name="AnyoneLabel"
+          top_pad="8"
+          width="100">
+          Anyone:
+        </text>
+        <check_box
+          height="18"
+          label="Copy"
           layout="topleft"
-          right="-5"
-          name="BtnCreator"
-          top_delta="-6"
-          width="16" />
-          <text
+          left_pad="0"
+          name="CheckEveryoneCopy"
+          top_delta="-2"
+          width="150" />
+        <text
           type="string"
           length="1"
           follows="left|top"
-          height="23"
+          height="16"
           layout="topleft"
-            left="5"
-          name="LabelOwnerTitle"
-            top_pad="10"
-          width="78">
-            Owner:
-          </text>
-          <avatar_icon
-            follows="top|left"
-            height="20"
-            default_icon_name="Generic_Person"
-            layout="topleft"
-            left_pad="0"
-            top_delta="-6"
-            mouse_opaque="true"
-            width="20" />
-          <text
+          left="10"
+          name="GroupLabel"
+          top_pad="8"
+          width="100">
+          Group:
+        </text>
+        <check_box
+          height="18"
+          label="Share"
+          layout="topleft"
+          left_pad="0"
+          top_delta="-2"
+          name="CheckShareWithGroup"
+          tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
+          width="150" />
+        <text
           type="string"
-            follows="left|right|top"
-            font="SansSerifSmall"
-            height="15"
-            layout="topleft"
-            left_pad="5"
-          name="LabelOwnerName"
-          top_delta="6"
-       use_ellipses="true"
-			 width="165">
-          </text>
-             <button
-                 follows="top|right"
-                 height="16"
-         image_selected="Inspector_I"
-         image_unselected="Inspector_I"
-                 layout="topleft"
-                 right="-5"
-                 name="BtnOwner"
-                 top_delta="-3"
-                 width="16" />
-             <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 height="23"
-                 layout="topleft"
-                 left="5"
-                 name="LabelAcquiredTitle"
-    top_pad="10"
-                 width="78">
-                Acquired:
-             </text>
-             <text
-                 type="string"
-                 length="1"
-                 follows="left|top|right"
-                 height="23"
-                 layout="topleft"
-                 left_delta="78"
-                 name="LabelAcquiredDate"
-                 top_delta="0"
-                 width="210">
-          </text>
-         <panel
-             border="false"
-             follows="left|top|right"
-             layout="topleft"
-             mouse_opaque="false"
-             name="perms_inv"
-             left="0"
-             top_pad="25"
-             height="155"
-             width="313">
-          <text
-                 type="string"
-                 length="1"
-                 left="10"
-                 top_pad="13"
-                 text_color="EmphasisColor"
-             height="15"
-                 follows="left|top|right"
-                 layout="topleft"
-                 name="perm_modify"
-                 width="200">
-                    You can:
-                </text>
-            <check_box
-                 height="18"
-                 label="Modify"
-                 layout="topleft"
-                 left="20"
-                 name="CheckOwnerModify"
-                 top_pad="0"
-                 width="90" />
-            <check_box
-                 height="18"
-                 label="Copy"
-                 layout="topleft"
-                 left_pad="0"
-                 name="CheckOwnerCopy"
-                 width="90" />
-            <check_box
-                 height="18"
-                 label="Transfer"
-                 layout="topleft"
-                 left_pad="0"
-                 name="CheckOwnerTransfer"
-                 width="106" />
-            <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 height="16"
-                 layout="topleft"
-                 left="10"
-                 name="AnyoneLabel"
-                 top_pad="8"
-                 width="100">
-                Anyone:
-            </text>
-            <check_box
-                 height="18"
-                 label="Copy"
-                 layout="topleft"
-                 left_pad="0"
-                 name="CheckEveryoneCopy"
-                 top_delta="-2"
-                 width="150" />
-            <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 height="16"
-                 layout="topleft"
-                 left="10"
-                 name="GroupLabel"
-                 top_pad="8"
-                 width="100">
-                Group:
-            </text>
-            <check_box
-                 height="18"
-                 label="Share"
-                 layout="topleft"
-                 left_pad="0"
-                 top_delta="-2"
-                 name="CheckShareWithGroup"
-                 tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
-                 width="150" />
-            <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 height="16"
-                 layout="topleft"
-                 left="10"
-                 name="NextOwnerLabel"
-                 top_pad="8"
-                 width="200"
-                 word_wrap="true">
-                Next owner:
-            </text>
-            <check_box
-                 height="18"
-                 label="Modify"
-                 layout="topleft"
-                 left="20"
-                 top_pad="0"
-                 name="CheckNextOwnerModify"
-                 width="90" />
-            <check_box
-                 height="18"
-                 label="Copy"
-                 layout="topleft"
-                 left_pad="0"
-                 name="CheckNextOwnerCopy"
-                 width="90" />
-            <check_box
-                 height="18"
-                 label="Transfer"
-                 layout="topleft"
-                 left_pad="0"
-                 name="CheckNextOwnerTransfer"
-                 tool_tip="Next owner can give away or resell this object"
-                 width="106" />
-            </panel>
+          length="1"
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="10"
+          name="NextOwnerLabel"
+          top_pad="8"
+          width="200"
+          word_wrap="true">
+          Next owner:
+        </text>
         <check_box
-                 height="18"
-                 label="For Sale"
-                 layout="topleft"
-                 left="20"
-                 name="CheckPurchase"
-                 top_pad="20"
-                 width="100" />
-            <combo_box
-                 height="23"
-                 left_pad="0"
-                 layout="topleft"
-                 follows="left|top"
-                 name="combobox sale copy"
-                 width="170">
-                <combo_box.item
-                     label="Copy"
-                     name="Copy"
-                     value="Copy" />
-                <combo_box.item
-                     label="Original"
-                     name="Original"
-                     value="Original" />
-            </combo_box>
-            <spinner
-                    follows="left|top"
-                    decimal_digits="0"
-                    increment="1"
-                    control_name="Edit Cost"
-                    name="Edit Cost"
-                    label="Price: L$"
-                    label_width="75"
-                    left="120"
-                    width="170"
-                    min_val="0"
-                    height="23"
-                    max_val="999999999"
-                    top_pad="10"/>
-        </panel>
-    </scroll_container>
-    <panel
-		 height="30"
-		 layout="topleft"
-		 name="button_panel"
-		 left="5"
-		 top_pad="0"
-		 width="313">
-	    <button
-		     height="23"
-		     label="Cancel"
-		     layout="topleft"
-		     name="cancel_btn"
-		     right="-1"
-		     width="100" />
-	    </panel>
-	</panel>
+          height="18"
+          label="Modify"
+          layout="topleft"
+          left="20"
+          top_pad="0"
+          name="CheckNextOwnerModify"
+          width="90" />
+        <check_box
+          height="18"
+          label="Copy"
+          layout="topleft"
+          left_pad="0"
+          name="CheckNextOwnerCopy"
+          width="90" />
+        <check_box
+          height="18"
+          label="Transfer"
+          layout="topleft"
+          left_pad="0"
+          name="CheckNextOwnerTransfer"
+          tool_tip="Next owner can give away or resell this object"
+          width="106" />
+      </panel>
+      <check_box
+        height="18"
+        label="For Sale"
+        layout="topleft"
+        left="20"
+        name="CheckPurchase"
+        top_pad="20"
+        width="100" />
+      <combo_box
+        height="23"
+        left_pad="0"
+        layout="topleft"
+        follows="left|top"
+        name="combobox sale copy"
+        width="170">
+        <combo_box.item
+          label="Copy"
+          name="Copy"
+          value="Copy" />
+        <combo_box.item
+          label="Original"
+          name="Original"
+          value="Original" />
+      </combo_box>
+      <spinner
+        follows="left|top"
+        decimal_digits="0"
+        increment="1"
+        control_name="Edit Cost"
+        name="Edit Cost"
+        label="Price: L$"
+        label_width="75"
+        left="120"
+        width="170"
+        min_val="0"
+        height="23"
+        max_val="999999999"
+        top_pad="10"/>
+
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left="5"
+        name="LabelItemExperienceTitle"
+        top_pad="10"
+        width="78">
+        Experience:
+      </text>
+      <text
+        type="string"
+        length="1"
+        follows="left|top|right"
+        height="10"
+        layout="topleft"
+        left_delta="78"
+        name="LabelItemExperience"
+        top_delta="0"
+         width="210" 
+        >(loading)</text>
+    </panel>
+    
+  </scroll_container>
+  <panel
+    height="30"
+    layout="topleft"
+    name="button_panel"
+    left="5"
+    top_pad="0"
+    width="313"
+    follows="top|right|left">
+    <button
+      follows="top|right"
+      height="23"
+      label="Cancel"
+      layout="topleft"
+      name="cancel_btn"
+      right="-1"
+      width="100" />
+  </panel>
+</panel>
-- 
cgit v1.2.3


From b980efd014ddb56650fffeb7968901b8e6bc2837 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Mon, 19 Aug 2013 09:24:04 -0700
Subject: Added experience association info llsidepaneliteminfo for scripts.
 Changed the cap which looks up a script association to take a object/item id
 pair   instead of a asset id. Updated llpreviewscript to use the new cap
 (which also improves loading time   since it can be done in parallel with the
 lsltext retrieval).

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index c9c19f6d57..f1f8843a9d 100755
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -11,6 +11,10 @@
     name="no_experience">
     (none)
   </panel.string>
+  <panel.string
+    name="loading_experience">
+    (loading)
+  </panel.string>
   <panel.string
     name="unknown">
     (unknown)
@@ -434,7 +438,8 @@
         left="5"
         name="LabelItemExperienceTitle"
         top_pad="10"
-        width="78">
+        width="78"
+        visible="false">
         Experience:
       </text>
       <text
@@ -446,10 +451,11 @@
         left_delta="78"
         name="LabelItemExperience"
         top_delta="0"
-         width="210" 
-        >(loading)</text>
+        width="210"
+        visible="false"
+        ></text>
     </panel>
-    
+
   </scroll_container>
   <panel
     height="30"
-- 
cgit v1.2.3


From b33354e1d19f8efafda8b41748c576227595bf5e Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Mon, 19 Aug 2013 17:16:56 -0700
Subject: Updated experience profile panel layout

---
 .../skins/default/xui/en/panel_experience_info.xml | 437 ++++++++++++++++-----
 1 file changed, 328 insertions(+), 109 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_experience_info.xml b/indra/newview/skins/default/xui/en/panel_experience_info.xml
index 6df6c2e27d..268e7462c1 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_info.xml
@@ -4,10 +4,10 @@
   follows="all"
   height="570"
   layout="topleft"
-  left="0"
+  left="5"
   min_height="350"
-  top="0"
-  width="333"
+  top="5"
+  width="348"
   name="panel_experience_info">
   <text
     follows="top|left|right"
@@ -18,7 +18,7 @@
     name="title"
     text_color="White"
     top="2"
-    value="Experience Info"
+    value="Experience Profile"
     use_ellipses="true"
     left="3"
     right="-3"/>
@@ -31,127 +31,346 @@
     name="xp_scroll"
     opaque="true"
     top_pad="10"
-    width="310">
+    width="330">
     <panel
       bg_alpha_color="DkGray2"
-      follows="left|top|right"
-      height="630"
+      follows="top|left"
+      height="480"
       layout="topleft"
       left="0"
-      min_height="300"
+      min_height="480"
       name="scrolling_panel"
       top="0"
-      width="310">
-      <texture_picker
-        enabled="false"
-        fallback_image="default_land_picture.j2c"
-        follows="left|top|right"
-        height="197"
+      width="315"
+      min_width="315">
+      <layout_stack
+        follows="all"
+        height="480"
         layout="topleft"
-        left="11"
-        name="logo"
-        top="10"
-        width="290" />
-      <text
-        follows="left|top|right"
-        font="SansSerifLarge"
-        height="14"
-        layout="topleft"
-        left="10"
-        name="region_title"
-        text_color="white"
-        top_pad="10"
-        use_ellipses="true"
-        value=" Experience Name"
-        width="280"/>
-
-      <expandable_text
-        follows="left|top|right"
-        height="50"
-        layout="topleft"
-        left="10"
-        name="description"
-        top_pad="10"
-        value="It's an experience"
-        width="280" />
-
-      <text
-        follows="left|top"
-        height="16"
-        layout="topleft"
-        left="10"
-        top_pad="10"
-        value="Maturity level:"
-        width="130" />
-      <icon
-        follows="top|left"
-        height="16"
-        image_name="unknown"
-        layout="topleft"
-        left_pad="10"
-        name="maturity_icon"
-        top_pad="-18"
-        width="18" />
-      <text
-        follows="top|left"
-        height="16"
-        layout="topleft"
-        left_pad="5"
-        name="maturity_value"
-        top_pad="-14"
-        value="unknown"
-        width="118" />
-      <panel
-        follows="left|top|right"
-        name="location_panel"
-        left="10"
-        width="280" visible="false"
-        top_pad="10" height="42">
-        <text
-          follows="left|top|right"
-          height="16"
+        left="0"
+        top="0"
+        orientation="vertical"
+        width="315">
+        <layout_panel
+          follows="all"
+          height="197"
           layout="topleft"
-          left="00"
+          left="0"
           top="0"
-          value="Location:"
-          width="280" />
-
-        <text
-          follows="left|top|right"
-          height="16"
+          auto_resize="false"
+          visible="true"
+          width="315"
+          name="image_panel">
+          <texture_picker
+            enabled="false"
+            fallback_image="default_land_picture.j2c"
+            follows="left|top"
+            height="197"
+            layout="topleft"
+            left="10"
+            name="logo"
+            top="10"
+            width="290" />
+        </layout_panel>
+        <layout_panel
+          follows="all"
+          height="19"
           layout="topleft"
           left="0"
-          top_pad="10"
-          value="Location:"
-          width="280" />
-      </panel>
-
-      <panel
-        follows="left|top|right"
-        name="location_panel"
-        left="10"
-        width="280"
-        top_pad="10"
-        height="42">
-        <text
-          follows="left|top|right"
-          height="16"
+          top="5"
+          width="313"
+          auto_resize="false"
+            >
+          <text
+            follows="left|top|right"
+            font="SansSerifLarge"
+            height="14"
+            layout="topleft"
+            left="10"
+            name="experience_title"
+            text_color="white"
+            top="0"
+            use_ellipses="true"
+            value="Kyle's Superhero RPG"
+            width="288"/>
+        </layout_panel>
+        <layout_panel
+          follows=""
+          height="50"
           layout="topleft"
-          left="00"
+          left="0"
           top="0"
-          value="Location:"
-          width="280" />
-
-        <text
-          follows="left|top|right"
-          height="16"
+          auto_resize="false"
+          width="315"
+          name="description panel">
+          <expandable_text
+            follows="left|top|right"
+            font="SansSerif"
+            height="50"
+            layout="topleft"
+            left="7"
+            name="experience_description"
+            top="0"
+            value="It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. "
+            width="293"/>
+        </layout_panel>
+        <layout_panel
+          follows="all"
+          height="69"
           layout="topleft"
           left="0"
-          top_pad="10"
-          value="Location:"
-          width="280" />
-      </panel>
+          top="5"
+          width="313"
+          visible="true"
+          auto_resize="false"
+          name="location panel"
+            >
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            left="10"
+            name="Location"
+            width="290">
+            Location:
+          </text>
+          <text
+            type="string"
+            length="1"
+            follows="left|top|right"
+            height="18"
+            layout="topleft"
+            left="10"
+            valign="center"
+            name="LocationTextText"
+            width="288">
+            someplace
+          </text>
+          <button
+            follows="bottom|left"
+            height="23"
+            label="Teleport"
+            layout="topleft"
+            name="teleport_btn"
+            width="151"
+            left="10"/>
+          <button
+            follows="bottom|left"
+            height="23"
+            label="Map"
+            layout="topleft"
+            name="map_btn"
+            top_pad="-23"
+            width="101"
+            left_pad="5"/>
+        </layout_panel>
+        <layout_panel
+          follows="all"
+          height="53"
+          layout="topleft"
+          left="0"
+          top="5"
+          width="313"
+          visible="true"
+          auto_resize="false"
+          name="marketplace panel"
+          
+            >
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            left="10"
+            name="Location"
+            width="290">
+            Marketplace store:
+          </text>
+          <text
+            type="string"
+            length="1"
+            follows="left|top|right"
+            height="18"
+            layout="topleft"
+            left="10"
+            valign="center"
+            name="LocationTextText"
+            width="288">
+            someplace
+          </text>
+        </layout_panel>
+        <layout_panel
+          follows="left|top|right"
+          height="69"
+          left="0"
+          top="0"
+          auto_resize="false"
+          width="315"
+            >
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            left="10"
+            name="ContentRating"
+            width="100">
+            Rating:
+          </text>
+          <text
+            type="string"
+            length="1"
+            follows="left|top|right"
+            height="18"
+            layout="topleft"
+            left_pad="2"
+            valign="center"
+            name="ContentRatingText"
+            top_delta="-2"
+            width="188">
+            Adult
+          </text>
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            left="10"
+            name="Owner"
+            width="100">
+            Owner:
+          </text>
+          <text
+            type="string"
+            length="1"
+            follows="left|top|right"
+            height="18"
+            layout="topleft"
+            left_pad="2"
+            valign="center"
+            name="OwnerText"
+            top_delta="-2"
+            width="188">
+            Kyle
+          </text>
+          <button
+            follows="bottom|left"
+            height="23"
+            label="Edit"
+            layout="topleft"
+            name="edit_btn"
+            top_pad="0"
+            width="151"
+            left="10"/>
+          <!--
+        
+
+          <expandable_text
+            allow_scroll="false"
+            bg_visible="false"
+            follows="left|top|right"
+            h_pad="0"
+            height="35"
+            width="280"
+            layout="topleft"
+            font="SansSerifBig"
+            font.style="BOLD"
+            left="10"
+            top_pad="10"
+            name="pick_name"
+            read_only="false"
+            text_color="white"
+            v_pad="0"
+            use_ellipses="true"
+            value="It's an experience" />
+
+          <text
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            left="10"
+            top_pad="10"
+            value="Maturity level:"
+            width="130" />
+          <icon
+            follows="top|left"
+            height="16"
+            image_name="unknown"
+            layout="topleft"
+            left_pad="10"
+            name="maturity_icon"
+            top_pad="-18"
+            width="18" />
+          <text
+            follows="top|left"
+            height="16"
+            layout="topleft"
+            left_pad="5"
+            name="maturity_value"
+            top_pad="-14"
+            value="unknown"
+            width="118" />
+          <panel
+            follows="left|top|right"
+            name="location_panel"
+            left="10"
+            width="280"
+            visible="false"
+            top_pad="10"
+            height="42">
+            <text
+              follows="left|top|right"
+              height="16"
+              layout="topleft"
+              left="00"
+              top="0"
+              value="Location:"
+              width="280" />
+
+            <text
+              follows="left|top|right"
+              height="16"
+              layout="topleft"
+              left="0"
+              top_pad="10"
+              value="Location:"
+              width="280" />
+          </panel>
+
+          <panel
+            follows="left|top|right"
+            name="location_panel"
+            left="10"
+            width="280"
+            top_pad="10"
+            height="42">
+            <text
+              follows="left|top|right"
+              height="16"
+              layout="topleft"
+              left="00"
+              top="0"
+              value="Location:"
+              width="280" />
+
+            <text
+              follows="left|top|right"
+              height="16"
+              layout="topleft"
+              left="0"
+              top_pad="10"
+              value="Location:"
+              width="280" />
+          </panel>
 
+-->
+        </layout_panel>
+      </layout_stack>
     </panel>
   </scroll_container>
 
-- 
cgit v1.2.3


From 257110c11e5546f0a5a07b087694cfc9059367b4 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Wed, 21 Aug 2013 15:43:09 -0700
Subject: Added new fields to the experience cache. Experience profile moved to
 it's own floater, will probalby be moving again. XP profile displays most
 data, though the presentation is not final Fixed a bug with the XP selection
 combobox in the script editor

---
 .../default/xui/en/floater_experienceprofile.xml   | 293 +++++++++++++++++++++
 1 file changed, 293 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_experienceprofile.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
new file mode 100644
index 0000000000..d9990f3a59
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<floater
+  positioning="cascading"
+  can_close="true"
+  enabled="true" 
+  can_resize="true"
+  height="580"
+  min_height="350"
+  min_width="300"
+  layout="topleft"
+  name="floater_experience_profile"
+  save_rect="yes"
+  single_instance="false"
+  reuse_instance="false"
+  title="EXPERIENCE PROFILE"
+  width="358">
+  <panel
+    background_visible="true"
+    follows="all"
+    height="570"
+    layout="topleft"
+    left="5"
+    min_height="350"
+    top="5"
+    width="348"
+    name="panel_experience_info">
+    <text
+      follows="top|left|right"
+      font="SansSerifHugeBold"
+      height="26"
+      layout="topleft"
+      left_pad="4"
+      name="title"
+      text_color="White"
+      top="2"
+      value="Experience Profile"
+      use_ellipses="true"
+      left="3"
+      right="-3"/>
+    <scroll_container
+      color="DkGray2"
+      follows="all"
+      height="532"
+      layout="topleft"
+      left="9"
+      name="xp_scroll"
+      opaque="true"
+      top_pad="10"
+      width="330">
+      <panel
+        bg_alpha_color="DkGray2"
+        follows="top|left"
+        height="480"
+        layout="topleft"
+        left="0"
+        min_height="480"
+        name="scrolling_panel"
+        top="0"
+        width="315"
+        min_width="315">
+        <layout_stack
+          follows="all"
+          height="480"
+          layout="topleft"
+          left="0"
+          top="0"
+          orientation="vertical"
+          width="315">
+          <layout_panel
+            follows="all"
+            height="197"
+            layout="topleft"
+            left="0"
+            top="0"
+            auto_resize="false"
+            visible="false"
+            width="315"
+            name="image_panel">
+            <texture_picker
+              enabled="false"
+              fallback_image="default_land_picture.j2c"
+              follows="left|top"
+              height="197"
+              layout="topleft"
+              left="10"
+              name="logo"
+              top="10"
+              width="290" />
+          </layout_panel>
+          <layout_panel
+            follows="all"
+            height="19"
+            layout="topleft"
+            left="0"
+            top="5"
+            width="313"
+            auto_resize="false"
+            >
+            <text
+              follows="left|top|right"
+              font="SansSerifLarge"
+              height="14"
+              layout="topleft"
+              left="10"
+              name="experience_title"
+              text_color="white"
+              top="0"
+              use_ellipses="true"
+              value="Kyle's Superhero RPG"
+              width="288"/>
+          </layout_panel>
+          <layout_panel
+            follows=""
+            height="50"
+            layout="topleft"
+            left="0"
+            top="0"
+            auto_resize="false"
+            width="315"
+            visible="false"
+            name="description panel">
+            <expandable_text
+              follows="left|top|right"
+              font="SansSerif"
+              height="50"
+              layout="topleft"
+              left="7"
+              name="experience_description"
+              top="0"
+              value="It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. "
+              width="293"/>
+          </layout_panel>
+          <layout_panel
+            follows="all"
+            height="69"
+            layout="topleft"
+            left="0"
+            top="5"
+            width="313"
+            visible="false"
+            auto_resize="false"
+            name="location panel"
+            >
+            <text
+              type="string"
+              length="1"
+              follows="left|top"
+              height="16"
+              layout="topleft"
+              left="10"
+              name="Location"
+              width="290">
+              Location:
+            </text>
+            <text
+              type="string"
+              length="1"
+              follows="left|top|right"
+              height="18"
+              layout="topleft"
+              left="10"
+              valign="center"
+              name="LocationTextText"
+              width="288">
+              someplace
+            </text>
+            <button
+              follows="bottom|left"
+              height="23"
+              label="Teleport"
+              layout="topleft"
+              name="teleport_btn"
+              width="151"
+              left="10"/>
+            <button
+              follows="bottom|left"
+              height="23"
+              label="Map"
+              layout="topleft"
+              name="map_btn"
+              top_pad="-23"
+              width="101"
+              left_pad="5"/>
+          </layout_panel>
+          <layout_panel
+            follows="all"
+            height="53"
+            layout="topleft"
+            left="0"
+            top="5"
+            width="313"
+            visible="false"
+            auto_resize="false"
+            name="marketplace panel"
+          
+            >
+            <text
+              type="string"
+              length="1"
+              follows="left|top"
+              height="16"
+              layout="topleft"
+              left="10"
+              width="290">
+              Marketplace store:
+            </text>
+            <text
+              type="string"
+              length="1"
+              follows="left|top|right"
+              height="18"
+              layout="topleft"
+              left="10"
+              valign="center"
+              name="marketplace"
+              width="288">
+              someplace
+            </text>
+          </layout_panel>
+          <layout_panel
+            follows="left|top|right"
+            height="69"
+            left="0"
+            top="0"
+            auto_resize="false"
+            width="315"
+            >
+            <text
+              type="string"
+              length="1"
+              follows="left|top"
+              height="16"
+              layout="topleft"
+              left="10"
+              name="ContentRating"
+              width="100">
+              Rating:
+            </text>
+            <text
+              type="string"
+              length="1"
+              follows="left|top|right"
+              height="18"
+              layout="topleft"
+              left_pad="2"
+              valign="center"
+              name="ContentRatingText"
+              top_delta="-2"
+              width="188">
+              Adult
+            </text>
+            <text
+              type="string"
+              length="1"
+              follows="left|top"
+              height="16"
+              layout="topleft"
+              left="10"
+              name="Owner"
+              width="100">
+              Owner:
+            </text>
+            <text
+              type="string"
+              length="1"
+              follows="left|top|right"
+              height="18"
+              layout="topleft"
+              left_pad="2"
+              valign="center"
+              name="OwnerText"
+              top_delta="-2"
+              width="188">
+              Kyle
+            </text>
+            <button
+              follows="bottom|left"
+              height="23"
+              label="Edit"
+              layout="topleft"
+              name="edit_btn"
+              top_pad="0"
+              width="151"
+              left="10"/>
+
+          </layout_panel>
+        </layout_stack>
+      </panel>
+    </scroll_container>
+
+  </panel>
+</floater>
-- 
cgit v1.2.3


From eaf847e60df3c078d15f8991e9448b06ffa83bf7 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Tue, 27 Aug 2013 16:37:08 -0700
Subject: experience profile work in progress

---
 .../default/xui/en/floater_experienceprofile.xml   | 67 ++++++++++++++--------
 1 file changed, 43 insertions(+), 24 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index d9990f3a59..668a3bcc2e 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -10,18 +10,33 @@
   min_width="300"
   layout="topleft"
   name="floater_experience_profile"
-  save_rect="yes"
   single_instance="false"
   reuse_instance="false"
   title="EXPERIENCE PROFILE"
   width="358">
+  <floater.string
+    name="maturity_icon_general">
+    "Parcel_PG_Light"
+  </floater.string>
+  <floater.string
+    name="maturity_icon_moderate">
+    "Parcel_M_Light"
+  </floater.string>
+  <floater.string
+    name="maturity_icon_adult">
+    "Parcel_R_Light"
+  </floater.string>
+  <floater.string
+    name="forget_experience">
+    "Forget"
+  </floater.string>
   <panel
     background_visible="true"
     follows="all"
     height="570"
     layout="topleft"
     left="5"
-    min_height="350"
+    min_height="250"
     top="5"
     width="348"
     name="panel_experience_info">
@@ -133,7 +148,7 @@
           </layout_panel>
           <layout_panel
             follows="all"
-            height="69"
+            height="46"
             layout="topleft"
             left="0"
             top="5"
@@ -165,23 +180,6 @@
               width="288">
               someplace
             </text>
-            <button
-              follows="bottom|left"
-              height="23"
-              label="Teleport"
-              layout="topleft"
-              name="teleport_btn"
-              width="151"
-              left="10"/>
-            <button
-              follows="bottom|left"
-              height="23"
-              label="Map"
-              layout="topleft"
-              name="map_btn"
-              top_pad="-23"
-              width="101"
-              left_pad="5"/>
           </layout_panel>
           <layout_panel
             follows="all"
@@ -246,7 +244,7 @@
               left_pad="2"
               valign="center"
               name="ContentRatingText"
-              top_delta="-2"
+              top_delta="-3"
               width="188">
               Adult
             </text>
@@ -280,9 +278,30 @@
               label="Edit"
               layout="topleft"
               name="edit_btn"
-              top_pad="0"
-              width="151"
-              left="10"/>
+              top_pad="3"
+              width="80"
+              left="10"
+              visible="false"/>
+            <button
+              follows="bottom|left"
+              height="23"
+              label="Allow"
+              layout="topleft"
+              name="allow_btn"
+              width="80"
+              top_pad="-23"
+              left_pad="3"
+              enabled="false"/>
+            <button
+              follows="bottom|left"
+              height="23"
+              label="Block"
+              layout="topleft"
+              name="block_btn"
+              width="80"
+              top_pad="-23"
+              left_pad="3"
+              enabled="false"/>
 
           </layout_panel>
         </layout_stack>
-- 
cgit v1.2.3


From df437553ede576df4e6a1c5e4a2e177f7d8275c2 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Tue, 3 Sep 2013 10:14:24 -0700
Subject: Updated experience profile floater to have permission buttons

---
 .../default/xui/en/floater_experienceprofile.xml   | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index 668a3bcc2e..58c0ed70ef 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -26,10 +26,6 @@
     name="maturity_icon_adult">
     "Parcel_R_Light"
   </floater.string>
-  <floater.string
-    name="forget_experience">
-    "Forget"
-  </floater.string>
   <panel
     background_visible="true"
     follows="all"
@@ -218,7 +214,7 @@
           </layout_panel>
           <layout_panel
             follows="left|top|right"
-            height="69"
+            height="92"
             left="0"
             top="0"
             auto_resize="false"
@@ -279,9 +275,9 @@
               layout="topleft"
               name="edit_btn"
               top_pad="3"
-              width="80"
-              left="10"
-              visible="false"/>
+              width="120"
+              left="73"
+              visible="true"/>
             <button
               follows="bottom|left"
               height="23"
@@ -289,6 +285,16 @@
               layout="topleft"
               name="allow_btn"
               width="80"
+              top_pad="3"
+              left="10"
+              enabled="false"/>
+            <button
+              follows="bottom|left"
+              height="23"
+              label="Forget"
+              layout="topleft"
+              name="forget_btn"
+              width="80"
               top_pad="-23"
               left_pad="3"
               enabled="false"/>
-- 
cgit v1.2.3


From ece98188a8e5c76adddf884886f44b6fc9c5ae21 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Fri, 6 Sep 2013 17:09:50 -0700
Subject: Added profile editing to the experience profile floater.

---
 .../default/xui/en/floater_experienceprofile.xml   | 757 +++++++++++++--------
 1 file changed, 488 insertions(+), 269 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index 58c0ed70ef..f47042ea33 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -3,15 +3,8 @@
 <floater
   positioning="cascading"
   can_close="true"
-  enabled="true" 
+  enabled="true"
   can_resize="true"
-  height="580"
-  min_height="350"
-  min_width="300"
-  layout="topleft"
-  name="floater_experience_profile"
-  single_instance="false"
-  reuse_instance="false"
   title="EXPERIENCE PROFILE"
   width="358">
   <floater.string
@@ -26,293 +19,519 @@
     name="maturity_icon_adult">
     "Parcel_R_Light"
   </floater.string>
-  <panel
-    background_visible="true"
+  <text
+    follows="top|left|right"
+    font="SansSerifHugeBold"
+    height="26"
+    layout="topleft"
+    left_pad="4"
+    name="edit_title"
+    text_color="White"
+    top="2"
+    value="Experience Profile"
+    use_ellipses="true"
+    left="3"
+    right="-3"/>
+  <tab_container
+    hide_tabs="true"
     follows="all"
-    height="570"
+    height="540"
     layout="topleft"
     left="5"
     min_height="250"
-    top="5"
+    top_pad="3"
     width="348"
-    name="panel_experience_info">
-    <text
-      follows="top|left|right"
-      font="SansSerifHugeBold"
-      height="26"
-      layout="topleft"
-      left_pad="4"
-      name="title"
-      text_color="White"
-      top="2"
-      value="Experience Profile"
-      use_ellipses="true"
-      left="3"
-      right="-3"/>
-    <scroll_container
-      color="DkGray2"
+    name="tab_container">
+    <panel
+      background_visible="true"
       follows="all"
-      height="532"
+      height="570"
       layout="topleft"
-      left="9"
-      name="xp_scroll"
-      opaque="true"
-      top_pad="10"
-      width="330">
-      <panel
-        bg_alpha_color="DkGray2"
-        follows="top|left"
-        height="480"
+      left="0"
+      min_height="250"
+      top="0"
+      width="348"
+      name="panel_experience_info">
+      <scroll_container
+        color="DkGray2"
+        follows="all"
+        height="532"
         layout="topleft"
-        left="0"
-        min_height="480"
-        name="scrolling_panel"
-        top="0"
-        width="315"
-        min_width="315">
-        <layout_stack
-          follows="all"
+        left="9"
+        name="xp_scroll"
+        opaque="true"
+        top_pad="10"
+        width="330">
+        <panel
+          bg_alpha_color="DkGray2"
+          follows="top|left"
           height="480"
           layout="topleft"
           left="0"
+          min_height="480"
+          name="scrolling_panel"
           top="0"
-          orientation="vertical"
-          width="315">
-          <layout_panel
+          width="315"
+          min_width="315">
+          <layout_stack
             follows="all"
-            height="197"
+            height="480"
             layout="topleft"
             left="0"
             top="0"
-            auto_resize="false"
-            visible="false"
-            width="315"
-            name="image_panel">
-            <texture_picker
-              enabled="false"
-              fallback_image="default_land_picture.j2c"
-              follows="left|top"
+            orientation="vertical"
+            width="315">
+            <layout_panel
+              follows="all"
               height="197"
               layout="topleft"
-              left="10"
-              name="logo"
-              top="10"
-              width="290" />
-          </layout_panel>
-          <layout_panel
-            follows="all"
-            height="19"
-            layout="topleft"
-            left="0"
-            top="5"
-            width="313"
-            auto_resize="false"
-            >
-            <text
-              follows="left|top|right"
-              font="SansSerifLarge"
-              height="14"
-              layout="topleft"
-              left="10"
-              name="experience_title"
-              text_color="white"
+              left="0"
               top="0"
-              use_ellipses="true"
-              value="Kyle's Superhero RPG"
-              width="288"/>
-          </layout_panel>
-          <layout_panel
-            follows=""
-            height="50"
-            layout="topleft"
-            left="0"
-            top="0"
-            auto_resize="false"
-            width="315"
-            visible="false"
-            name="description panel">
-            <expandable_text
-              follows="left|top|right"
-              font="SansSerif"
-              height="50"
+              auto_resize="false"
+              visible="false"
+              width="315"
+              name="image_panel">
+              <texture_picker
+                enabled="false"
+                fallback_image="default_land_picture.j2c"
+                follows="left|top"
+                height="197"
+                layout="topleft"
+                left="10"
+                name="logo"
+                top="10"
+                width="290" />
+            </layout_panel>
+            <layout_panel
+              follows="all"
+              height="19"
               layout="topleft"
-              left="7"
-              name="experience_description"
-              top="0"
-              value="It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. "
-              width="293"/>
-          </layout_panel>
-          <layout_panel
-            follows="all"
-            height="46"
-            layout="topleft"
-            left="0"
-            top="5"
-            width="313"
-            visible="false"
-            auto_resize="false"
-            name="location panel"
+              left="0"
+              top="5"
+              width="313"
+              auto_resize="false"
             >
-            <text
-              type="string"
-              length="1"
-              follows="left|top"
-              height="16"
+              <text
+                follows="left|top|right"
+                font="SansSerifLarge"
+                height="14"
+                layout="topleft"
+                left="10"
+                name="experience_title"
+                text_color="white"
+                top="0"
+                use_ellipses="true"
+                value="Kyle's Superhero RPG"
+                width="288"/>
+            </layout_panel>
+            <layout_panel
+              follows=""
+              height="50"
               layout="topleft"
-              left="10"
-              name="Location"
-              width="290">
-              Location:
-            </text>
-            <text
-              type="string"
-              length="1"
-              follows="left|top|right"
-              height="18"
+              left="0"
+              top="0"
+              auto_resize="false"
+              width="315"
+              visible="false"
+              name="description panel">
+              <expandable_text
+                follows="left|top|right"
+                font="SansSerif"
+                height="50"
+                layout="topleft"
+                left="7"
+                name="experience_description"
+                top="0"
+                value="It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. "
+                width="293"/>
+            </layout_panel>
+            <layout_panel
+              follows="all"
+              height="46"
               layout="topleft"
-              left="10"
-              valign="center"
-              name="LocationTextText"
-              width="288">
-              someplace
-            </text>
-          </layout_panel>
-          <layout_panel
-            follows="all"
-            height="53"
-            layout="topleft"
-            left="0"
-            top="5"
-            width="313"
-            visible="false"
-            auto_resize="false"
-            name="marketplace panel"
-          
+              left="0"
+              top="5"
+              width="313"
+              visible="false"
+              auto_resize="false"
+              name="location panel"
             >
-            <text
-              type="string"
-              length="1"
-              follows="left|top"
-              height="16"
-              layout="topleft"
-              left="10"
-              width="290">
-              Marketplace store:
-            </text>
-            <text
-              type="string"
-              length="1"
-              follows="left|top|right"
-              height="18"
+              <text
+                type="string"
+                length="1"
+                follows="left|top"
+                height="16"
+                layout="topleft"
+                left="10"
+                name="Location"
+                width="290">
+                Location:
+              </text>
+              <text
+                type="string"
+                length="1"
+                follows="left|top|right"
+                height="18"
+                layout="topleft"
+                left="10"
+                valign="center"
+                name="LocationTextText"
+                width="288">
+                someplace
+              </text>
+            </layout_panel>
+            <layout_panel
+              follows="all"
+              height="53"
               layout="topleft"
-              left="10"
-              valign="center"
-              name="marketplace"
-              width="288">
-              someplace
-            </text>
-          </layout_panel>
-          <layout_panel
-            follows="left|top|right"
-            height="92"
-            left="0"
-            top="0"
-            auto_resize="false"
-            width="315"
+              left="0"
+              top="5"
+              width="313"
+              visible="false"
+              auto_resize="false"
+              name="marketplace panel"
+
             >
-            <text
-              type="string"
-              length="1"
-              follows="left|top"
-              height="16"
-              layout="topleft"
-              left="10"
-              name="ContentRating"
-              width="100">
-              Rating:
-            </text>
-            <text
-              type="string"
-              length="1"
+              <text
+                type="string"
+                length="1"
+                follows="left|top"
+                height="16"
+                layout="topleft"
+                left="10"
+                width="290">
+                Marketplace store:
+              </text>
+              <text
+                type="string"
+                length="1"
+                follows="left|top|right"
+                height="18"
+                layout="topleft"
+                left="10"
+                valign="center"
+                name="marketplace"
+                width="288">
+                someplace
+              </text>
+            </layout_panel>
+            <layout_panel
               follows="left|top|right"
-              height="18"
-              layout="topleft"
-              left_pad="2"
-              valign="center"
-              name="ContentRatingText"
-              top_delta="-3"
-              width="188">
-              Adult
-            </text>
-            <text
-              type="string"
-              length="1"
-              follows="left|top"
-              height="16"
-              layout="topleft"
-              left="10"
-              name="Owner"
-              width="100">
-              Owner:
-            </text>
-            <text
-              type="string"
-              length="1"
-              follows="left|top|right"
-              height="18"
-              layout="topleft"
-              left_pad="2"
-              valign="center"
-              name="OwnerText"
-              top_delta="-2"
-              width="188">
-              Kyle
-            </text>
-            <button
-              follows="bottom|left"
-              height="23"
-              label="Edit"
-              layout="topleft"
-              name="edit_btn"
-              top_pad="3"
-              width="120"
-              left="73"
-              visible="true"/>
-            <button
-              follows="bottom|left"
-              height="23"
-              label="Allow"
-              layout="topleft"
-              name="allow_btn"
-              width="80"
-              top_pad="3"
-              left="10"
-              enabled="false"/>
-            <button
-              follows="bottom|left"
-              height="23"
-              label="Forget"
-              layout="topleft"
-              name="forget_btn"
-              width="80"
-              top_pad="-23"
-              left_pad="3"
-              enabled="false"/>
-            <button
-              follows="bottom|left"
-              height="23"
-              label="Block"
-              layout="topleft"
-              name="block_btn"
-              width="80"
-              top_pad="-23"
-              left_pad="3"
-              enabled="false"/>
-
-          </layout_panel>
-        </layout_stack>
-      </panel>
-    </scroll_container>
+              height="92"
+              left="0"
+              top="0"
+              auto_resize="false"
+              width="315"
+            >
+              <text
+                type="string"
+                length="1"
+                follows="left|top"
+                height="16"
+                layout="topleft"
+                left="10"
+                name="ContentRating"
+                width="100">
+                Rating:
+              </text>
+              <text
+                type="string"
+                length="1"
+                follows="left|top|right"
+                height="18"
+                layout="topleft"
+                left_pad="2"
+                valign="center"
+                name="ContentRatingText"
+                top_delta="-3"
+                width="188">
+                Adult
+              </text>
+              <text
+                type="string"
+                length="1"
+                follows="left|top"
+                height="16"
+                layout="topleft"
+                left="10"
+                name="Owner"
+                width="100">
+                Owner:
+              </text>
+              <text
+                type="string"
+                length="1"
+                follows="left|top|right"
+                height="18"
+                layout="topleft"
+                left_pad="2"
+                valign="center"
+                name="OwnerText"
+                top_delta="-2"
+                width="188">
+                Kyle
+              </text>
+              <button
+                follows="bottom|left"
+                height="23"
+                label="Edit"
+                layout="topleft"
+                name="edit_btn"
+                top_pad="3"
+                width="120"
+                left="73"
+                visible="false"/>
+              <button
+                follows="bottom|left"
+                height="23"
+                label="Allow"
+                layout="topleft"
+                name="allow_btn"
+                width="80"
+                top_pad="3"
+                left="10"
+                enabled="false"/>
+              <button
+                follows="bottom|left"
+                height="23"
+                label="Forget"
+                layout="topleft"
+                name="forget_btn"
+                width="80"
+                top_pad="-23"
+                left_pad="3"
+                enabled="false"/>
+              <button
+                follows="bottom|left"
+                height="23"
+                label="Block"
+                layout="topleft"
+                name="block_btn"
+                width="80"
+                top_pad="-23"
+                left_pad="3"
+                enabled="false"/>
 
-  </panel>
+            </layout_panel>
+          </layout_stack>
+        </panel>
+      </scroll_container>
+    </panel>
+    <panel
+      background_visible="true"
+      follows="all"
+      layout="topleft"
+      height="540"
+      left="0"
+      top="0"
+      width="348"
+      name="edit_panel_experience_info">
+      <scroll_container
+        color="DkGray2"
+        follows="all"
+        height="525"
+        layout="topleft"
+        left="9"
+        name="edit_xp_scroll"
+        opaque="true"
+        top_pad="10"
+        width="330">
+        <panel
+          bg_alpha_color="DkGray2"
+          follows="top|left|right"
+          height="525"
+          layout="topleft"
+          left="0"
+          name="edit_scrolling_panel"
+          top="0"
+          width="310">
+          <texture_picker
+            enabled="true"
+            fallback_image="default_land_picture.j2c"
+            follows="left|top"
+            height="197"
+            layout="topleft"
+            left="10"
+            name="edit_logo"
+            top="10"
+            width="290" />
+          <text
+            follows="left|top|right"
+            height="14"
+            layout="topleft"
+            left="10"
+            name="edit_experience_title_label"
+            use_ellipses="true"
+            value="Name:"
+            right="-10"/>
+          <line_editor
+            follows="left|top|right"
+            height="19"
+            layout="topleft"
+            left="10"
+            name="edit_experience_title"
+            max_length_bytes="63"
+            text_color="black"
+            right="-10"/>
+          <text
+            follows="left|top|right"
+            height="14"
+            layout="topleft"
+            left="10"
+            top_pad="10"
+            name="edit_experience_desc_label"
+            use_ellipses="true"
+            value="Description:"
+            right="-10"/>
+          <text_editor
+            follows="left|top|right"
+            height="57"
+            layout="topleft"
+            left="11"
+            name="edit_experience_description"
+            max_length="2048"
+            text_color="black"
+            right="-11"
+            word_wrap="true"/>
+          <text
+            type="string"
+            length="1"
+            follows="left|top|right"
+            height="14"
+            layout="topleft"
+            left="10"
+            top_pad="10"
+            name="edit_Location"
+            right="-10">
+            Location:
+          </text>
+          <line_editor
+            type="string"
+            length="1"
+            follows="left|top|right"
+            height="19"
+            layout="topleft"
+            left="10"
+            max_length_bytes="255"
+            valign="center"
+            name="edit_LocationTextText"
+            right="-10"/>
+          <text
+            type="string"
+            length="1"
+            follows="left|top|right"
+            height="14"
+            top_pad="10"
+            layout="topleft"
+            left="10"
+            right="-10">
+            Marketplace store:
+          </text>
+          <line_editor
+            type="string"
+            length="1"
+            follows="left|top|right"
+            height="19"
+            layout="topleft"
+            left="10"
+            max_length_bytes="255"
+            valign="center"
+            name="edit_marketplace"
+            right="-10"/>
+          <text
+            top_pad="10"
+            type="string"
+            length="1"
+            follows="left|top|right"
+            height="16"
+            layout="topleft"
+            left="10"
+            name="edit_ContentRating"
+            right="-10">
+            Rating:
+          </text>
+          <icons_combo_box
+            follows="right|top"
+            height="20"
+            label="Moderate"
+            layout="topleft"
+            right="-10"
+            top_pad="-17"
+            name="edit_ContentRatingText"
+            width="105">
+            <icons_combo_box.drop_down_button
+              image_overlay="Parcel_M_Light"
+              image_overlay_alignment="left"
+              imgoverlay_label_space="3"
+              pad_left="3"/>
+            <icons_combo_box.item
+              label="Adult"
+              name="Adult"
+              value="42">
+              <item.columns
+                halign="center"
+                type="icon"
+                value="Parcel_R_Light"
+                width="20"/>
+            </icons_combo_box.item>
+            <icons_combo_box.item
+              label="Moderate"
+              name="Mature"
+              value="21">
+              <item.columns
+                halign="center"
+                type="icon"
+                value="Parcel_M_Light"
+                width="20"/>
+            </icons_combo_box.item>
+            <icons_combo_box.item
+              label="General"
+              name="PG"
+              value="13">
+              <item.columns
+                halign="center"
+                type="icon"
+                value="Parcel_PG_Light"
+                width="20"/>
+            </icons_combo_box.item>
+          </icons_combo_box>
+          <check_box width="140"
+                     height="21"
+                     left="10"
+                     layout="topleft"
+                     follows="top|left"
+                     label="Enable Experience"
+                     name="edit_enable_btn"/>
+          <check_box width="130"
+                     height="21"
+                     top_pad="-21"
+                     right="-10"
+                     layout="topleft"
+                     follows="top|left"
+                     label="Hide In Search"
+                     name="edit_private_btn"/>
+          <button
+            follows="top|left"
+            height="23"
+            label="Cancel"
+            layout="topleft"
+            name="cancel_btn"
+            width="120"
+            top_pad="15"
+            left="10"
+            visible="true"/>
+          <button
+            follows="top|right"
+            height="23"
+            label="Save"
+            layout="topleft"
+            name="save_btn"
+            top_pad="-23"
+            width="120"
+            right="-10"
+            visible="true"/>
+        </panel>
+      </scroll_container>
+    </panel>
+  </tab_container>
 </floater>
-- 
cgit v1.2.3


From f5b7343238626f52ea45ee74ed06294ae1f22a74 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Tue, 17 Sep 2013 19:58:20 -0700
Subject: Updated position of the edit button the experience profile and added
 the Grid Wide tag.

---
 .../default/xui/en/floater_experienceprofile.xml   | 221 ++++++++++++---------
 1 file changed, 123 insertions(+), 98 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index f47042ea33..8cf9714305 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -26,11 +26,10 @@
     layout="topleft"
     left_pad="4"
     name="edit_title"
-    text_color="White"
     top="2"
     value="Experience Profile"
     use_ellipses="true"
-    left="3"
+    left="6"
     right="-3"/>
   <tab_container
     hide_tabs="true"
@@ -64,7 +63,7 @@
         width="330">
         <panel
           bg_alpha_color="DkGray2"
-          follows="top|left"
+          follows="top|left|right"
           height="480"
           layout="topleft"
           left="0"
@@ -81,6 +80,41 @@
             top="0"
             orientation="vertical"
             width="315">
+            <layout_panel
+              follows="all"
+              height="29"
+              layout="topleft"
+              left="0"
+              top="0"
+              auto_resize="false"
+              visible="false"
+              width="315"
+              name="top panel">
+              <text
+                type="string"
+                length="1"
+                follows="left|top|right"
+                font="SansSerif"
+                height="19"
+                top="10"
+                layout="topleft"
+                left="10"
+                right="-123"
+                visible="false"
+                name="grid_wide">
+                Grid-wide
+              </text>
+              <button
+                follows="top|right"
+                height="23"
+                label="Edit"
+                layout="topleft"
+                name="edit_btn"
+                width="100"
+                visible="false"
+                top_pad="-23"
+                right="-14"/>
+            </layout_panel>
             <layout_panel
               follows="all"
               height="197"
@@ -109,8 +143,7 @@
               left="0"
               top="5"
               width="313"
-              auto_resize="false"
-            >
+              auto_resize="false">
               <text
                 follows="left|top|right"
                 font="SansSerifLarge"
@@ -118,10 +151,9 @@
                 layout="topleft"
                 left="10"
                 name="experience_title"
-                text_color="white"
                 top="0"
                 use_ellipses="true"
-                value="Kyle's Superhero RPG"
+                value=""
                 width="288"/>
             </layout_panel>
             <layout_panel
@@ -142,20 +174,19 @@
                 left="7"
                 name="experience_description"
                 top="0"
-                value="It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. "
+                value=""
                 width="293"/>
             </layout_panel>
             <layout_panel
-              follows="all"
-              height="46"
+              follows=""
+              height="18"
               layout="topleft"
               left="0"
-              top="5"
-              width="313"
-              visible="false"
+              top="0"
               auto_resize="false"
-              name="location panel"
-            >
+              width="315"
+              visible="true"
+              name="maturity panel">
               <text
                 type="string"
                 length="1"
@@ -163,9 +194,9 @@
                 height="16"
                 layout="topleft"
                 left="10"
-                name="Location"
-                width="290">
-                Location:
+                name="ContentRating"
+                width="100">
+                Rating:
               </text>
               <text
                 type="string"
@@ -173,25 +204,23 @@
                 follows="left|top|right"
                 height="18"
                 layout="topleft"
-                left="10"
+                left_pad="2"
                 valign="center"
-                name="LocationTextText"
-                width="288">
-                someplace
+                name="ContentRatingText"
+                top_delta="-3"
+                width="188">
               </text>
             </layout_panel>
             <layout_panel
               follows="all"
-              height="53"
+              height="46"
               layout="topleft"
               left="0"
               top="5"
               width="313"
               visible="false"
               auto_resize="false"
-              name="marketplace panel"
-
-            >
+              name="location panel">
               <text
                 type="string"
                 length="1"
@@ -199,8 +228,9 @@
                 height="16"
                 layout="topleft"
                 left="10"
+                name="Location"
                 width="290">
-                Marketplace store:
+                Location:
               </text>
               <text
                 type="string"
@@ -210,19 +240,20 @@
                 layout="topleft"
                 left="10"
                 valign="center"
-                name="marketplace"
+                name="LocationTextText"
                 width="288">
-                someplace
               </text>
             </layout_panel>
             <layout_panel
-              follows="left|top|right"
-              height="92"
+              follows="all"
+              height="53"
+              layout="topleft"
               left="0"
-              top="0"
+              top="5"
+              width="313"
+              visible="false"
               auto_resize="false"
-              width="315"
-            >
+              name="marketplace panel">
               <text
                 type="string"
                 length="1"
@@ -230,9 +261,8 @@
                 height="16"
                 layout="topleft"
                 left="10"
-                name="ContentRating"
-                width="100">
-                Rating:
+                width="290">
+                Marketplace store:
               </text>
               <text
                 type="string"
@@ -240,13 +270,19 @@
                 follows="left|top|right"
                 height="18"
                 layout="topleft"
-                left_pad="2"
+                left="10"
                 valign="center"
-                name="ContentRatingText"
-                top_delta="-3"
-                width="188">
-                Adult
+                name="marketplace"
+                width="288">
               </text>
+            </layout_panel>
+            <layout_panel
+              follows="left|top|right"
+              height="75"
+              left="0"
+              top="0"
+              auto_resize="false"
+              width="315">
               <text
                 type="string"
                 length="1"
@@ -269,18 +305,7 @@
                 name="OwnerText"
                 top_delta="-2"
                 width="188">
-                Kyle
               </text>
-              <button
-                follows="bottom|left"
-                height="23"
-                label="Edit"
-                layout="topleft"
-                name="edit_btn"
-                top_pad="3"
-                width="120"
-                left="73"
-                visible="false"/>
               <button
                 follows="bottom|left"
                 height="23"
@@ -393,51 +418,6 @@
             text_color="black"
             right="-11"
             word_wrap="true"/>
-          <text
-            type="string"
-            length="1"
-            follows="left|top|right"
-            height="14"
-            layout="topleft"
-            left="10"
-            top_pad="10"
-            name="edit_Location"
-            right="-10">
-            Location:
-          </text>
-          <line_editor
-            type="string"
-            length="1"
-            follows="left|top|right"
-            height="19"
-            layout="topleft"
-            left="10"
-            max_length_bytes="255"
-            valign="center"
-            name="edit_LocationTextText"
-            right="-10"/>
-          <text
-            type="string"
-            length="1"
-            follows="left|top|right"
-            height="14"
-            top_pad="10"
-            layout="topleft"
-            left="10"
-            right="-10">
-            Marketplace store:
-          </text>
-          <line_editor
-            type="string"
-            length="1"
-            follows="left|top|right"
-            height="19"
-            layout="topleft"
-            left="10"
-            max_length_bytes="255"
-            valign="center"
-            name="edit_marketplace"
-            right="-10"/>
           <text
             top_pad="10"
             type="string"
@@ -495,6 +475,51 @@
                 width="20"/>
             </icons_combo_box.item>
           </icons_combo_box>
+          <text
+            type="string"
+            length="1"
+            follows="left|top|right"
+            height="14"
+            layout="topleft"
+            left="10"
+            top_pad="10"
+            name="edit_Location"
+            right="-10">
+            Location:
+          </text>
+          <line_editor
+            type="string"
+            length="1"
+            follows="left|top|right"
+            height="19"
+            layout="topleft"
+            left="10"
+            max_length_bytes="255"
+            valign="center"
+            name="edit_LocationTextText"
+            right="-10"/>
+          <text
+            type="string"
+            length="1"
+            follows="left|top|right"
+            height="14"
+            top_pad="10"
+            layout="topleft"
+            left="10"
+            right="-10">
+            Marketplace store:
+          </text>
+          <line_editor
+            type="string"
+            length="1"
+            follows="left|top|right"
+            height="19"
+            layout="topleft"
+            left="10"
+            max_length_bytes="255"
+            valign="center"
+            name="edit_marketplace"
+            right="-10"/>
           <check_box width="140"
                      height="21"
                      left="10"
-- 
cgit v1.2.3


From c8144f7405178621f779b814fd4cb3e632786e0a Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Wed, 18 Sep 2013 15:55:42 -0700
Subject: Fixed enabled checkbox in the edit experience profile floater

---
 .../newview/skins/default/xui/en/floater_experienceprofile.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index 8cf9714305..a3408c5e58 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -6,7 +6,9 @@
   enabled="true"
   can_resize="true"
   title="EXPERIENCE PROFILE"
-  width="358">
+  min_width="325"
+  width="358"
+  height="580">
   <floater.string
     name="maturity_icon_general">
     "Parcel_PG_Light"
@@ -44,7 +46,7 @@
     <panel
       background_visible="true"
       follows="all"
-      height="570"
+      height="550"
       layout="topleft"
       left="0"
       min_height="250"
@@ -532,13 +534,13 @@
                      top_pad="-21"
                      right="-10"
                      layout="topleft"
-                     follows="top|left"
+                     follows="top|left|right"
                      label="Hide In Search"
                      name="edit_private_btn"/>
           <button
             follows="top|left"
             height="23"
-            label="Cancel"
+            label="Back"
             layout="topleft"
             name="cancel_btn"
             width="120"
-- 
cgit v1.2.3


From 48e1e10fd69aaea6ef22feb2518e80a120e9f999 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Mon, 23 Sep 2013 11:44:21 -0700
Subject: Added LLUrlEntryExperienceProfile to link to experience profiles
 Added LLExperienceHandler to handle experience links Updated
 LLSidepanelItemInfo to use profile links

---
 .../skins/default/xui/en/sidepanel_item_info.xml   | 57 ++++++++++------------
 indra/newview/skins/default/xui/en/strings.xml     |  2 +-
 2 files changed, 27 insertions(+), 32 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index f1f8843a9d..fc3fdbcfa5 100755
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -8,11 +8,7 @@
   title="Item Profile"
   width="333">
   <panel.string
-    name="no_experience">
-    (none)
-  </panel.string>
-  <panel.string
-    name="loading_experience">
+	name="loading_experience">
     (loading)
   </panel.string>
   <panel.string
@@ -267,6 +263,31 @@
         top_delta="0"
         width="210">
       </text>
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left="5"
+        name="LabelItemExperienceTitle"
+        top_pad="0"
+        width="78"
+        visible="true">
+        Experience:
+      </text>
+      <text
+        type="string"
+        length="1"
+        follows="left|top|right"
+        height="10"
+        layout="topleft"
+        left_delta="78"
+        name="LabelItemExperience"
+        top_delta="0"
+        width="210"
+        visible="true"
+        />
       <panel
         border="false"
         follows="left|top|right"
@@ -428,32 +449,6 @@
         height="23"
         max_val="999999999"
         top_pad="10"/>
-
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="10"
-        layout="topleft"
-        left="5"
-        name="LabelItemExperienceTitle"
-        top_pad="10"
-        width="78"
-        visible="false">
-        Experience:
-      </text>
-      <text
-        type="string"
-        length="1"
-        follows="left|top|right"
-        height="10"
-        layout="topleft"
-        left_delta="78"
-        name="LabelItemExperience"
-        top_delta="0"
-        width="210"
-        visible="false"
-        ></text>
     </panel>
 
   </scroll_container>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b02d4e5d8f..0c84d904a8 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3922,7 +3922,7 @@ Try enclosing path to the editor with double quotes.
   
   <!-- Experience Tools strings -->
   <string name="experience_tools_experience">Experience</string>
-
+  <string name="ExperienceNameNull">(no experience)</string>
 
   <!-- Conversation log messages -->
   <string name="logging_calls_disabled_log_empty">
-- 
cgit v1.2.3


From 09964ec6ede2c9dba5954448bff6b2da2dc179af Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Tue, 24 Sep 2013 19:10:43 -0700
Subject: Created an experience specific permissions dialog.

---
 .../default/xui/en/floater_experienceprofile.xml   |  4 +--
 .../newview/skins/default/xui/en/notifications.xml | 34 ++++++++++++++++++++++
 indra/newview/skins/default/xui/en/strings.xml     |  4 ++-
 3 files changed, 38 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index a3408c5e58..ca9469474c 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -103,9 +103,7 @@
                 left="10"
                 right="-123"
                 visible="false"
-                name="grid_wide">
-                Grid-wide
-              </text>
+                name="grid_wide"/>
               <button
                 follows="top|right"
                 height="23"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ebd2799ebf..ef4044bedd 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6930,6 +6930,40 @@ Is this OK?
        text="Block"/>
     </form>
   </notification>
+  <notification
+   icon="notify.tga"
+   name="ScriptQuestionExperience"
+   persist="true"
+   type="notify">
+&apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, an object owned by &apos;[NAME]&apos;, requests your participation in the [GRID_WIDE]experience:
+
+[EXPERIENCE]
+
+Once permission is granted you will not see this message again for this experience unless it is revoked from the experience profile.
+
+Scripts associated with this experience will be able to do the following on regions where the experience is active: 
+
+[QUESTIONS]Is this OK?
+  <tag>confirm</tag>
+    <form name="form">
+      <button
+       index="0"
+       name="Yes"
+       text="Yes"/>
+      <button
+       index="1"
+       name="No"
+       text="No"/>
+      <button
+        index="2"
+        name="Mute"
+        text="Block Object"/>
+      <button
+       index="3"
+       name="BlockExperience"
+       text="Block Experience"/>
+    </form>
+  </notification>
 
   <notification
    icon="notify.tga"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0c84d904a8..fc189b5d62 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -414,7 +414,8 @@ Please try logging in again in a minute.</string>
 	<string name="NotConnected">Not Connected</string>
 	<string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name -->
   <string name="TeleportYourAgent">Teleport you</string>
-	<string name="JoinAnExperience">Join an experience</string> <!-- not used -->
+	<string name="JoinAnExperience"></string> <!-- intentionally left blank -->
+  
 	<string name="SilentlyManageEstateAccess">Suppress alerts when managing estate access lists</string>
 	<string name="OverrideYourAnimations">Replace your default animations</string>
 	<string name="ScriptReturnObjects">Return objects on your behalf</string>
@@ -3923,6 +3924,7 @@ Try enclosing path to the editor with double quotes.
   <!-- Experience Tools strings -->
   <string name="experience_tools_experience">Experience</string>
   <string name="ExperienceNameNull">(no experience)</string>
+  <string name="GRID_WIDE">Grid-wide</string>
 
   <!-- Conversation log messages -->
   <string name="logging_calls_disabled_log_empty">
-- 
cgit v1.2.3


From e510fa3ee064ce03a48852fdea26be781e8fa8b6 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Thu, 3 Oct 2013 12:59:44 -0700
Subject: First pass at functional experience list floater

---
 .../skins/default/xui/en/floater_experiences.xml   | 20 ++++++------
 .../skins/default/xui/en/panel_experiences.xml     | 36 +++++++---------------
 indra/newview/skins/default/xui/en/strings.xml     |  5 +++
 3 files changed, 25 insertions(+), 36 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experiences.xml b/indra/newview/skins/default/xui/en/floater_experiences.xml
index 57541c8b35..1258ce26ac 100644
--- a/indra/newview/skins/default/xui/en/floater_experiences.xml
+++ b/indra/newview/skins/default/xui/en/floater_experiences.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 
 <floater
-  positioning="cascading"
   can_close="true"
   can_resize="true"
   height="400"
-  help_topic="sidebar_experiences"
+  width="300"
   min_height="300"
   min_width="300"
   layout="topleft"
@@ -13,17 +12,16 @@
   save_rect="false"
   single_instance="true"
   reuse_instance="false"
-  title="EXPERIENCES"
-  width="400">
-  <panel
+  bg_opaque_color="0 0.5 0 0.3"
+  title="EXPERIENCES">
+  <tab_container
     top="3"
     left="3"
     layout="topleft"
-    right="-3"
+    width="294"
     follows="all"
-    height="300"
-    class="experiences_panel"
-    filename="panel_experiences.xml"
-    >
-  </panel>
+    height="394"
+    name="xp_tabs">
+  </tab_container>
+
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_experiences.xml b/indra/newview/skins/default/xui/en/panel_experiences.xml
index 47a3005aae..bc78d0813c 100644
--- a/indra/newview/skins/default/xui/en/panel_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_experiences.xml
@@ -4,37 +4,23 @@
   layout="topleft"
   top="3"
   left="3"
-  right="-3"
-  bottom="-3"
+  width="200"
+  height="300"
   label="Experiences"
+  bg_opaque_color="0 0.5 0 0.3"
   follows="all">
   <string
     name="no_experiences"
     value="No experiences."/>
 
-  <accordion
-    fit_parent="true"
+  <flat_list_view
+    name="experiences_list"
     layout="topleft"
     top="0"
-    left="3"
-    right="-3"
-    bottom="-3"
-    single_expansion="true"
-    follows="all">
-    <accordion_tab
-      name="tab_experiences"
-      layout="topleft"
-      top="0"
-      left="0"
-      right="-3"
-      title="Experiences"
-      follows="all">
-      <flat_list_view
-        name="experiences_list"
-        layout="topleft"
-        top="0"
-        left="0"
-        follows="all"/>
-    </accordion_tab>
-  </accordion>
+    left="0"
+    width="200"
+    height="300"
+    follows="all"
+    >
+  </flat_list_view>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index fc189b5d62..70c990872e 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3925,6 +3925,11 @@ Try enclosing path to the editor with double quotes.
   <string name="experience_tools_experience">Experience</string>
   <string name="ExperienceNameNull">(no experience)</string>
   <string name="GRID_WIDE">Grid-wide</string>
+  <string name="Allowed_Experiences_Tab">Allowed</string>
+  <string name="Blocked_Experiences_Tab">Blocked</string>
+  <string name="Contrib_Experiences_Tab">Contributor</string>
+  <string name="Admin_Experiences_Tab">Admin</string>
+  <string name="Recent_Experiences_Tab">Recent</string>
 
   <!-- Conversation log messages -->
   <string name="logging_calls_disabled_log_empty">
-- 
cgit v1.2.3


From d44c85c6dc575c0c67019ce1bffecfaa5bc275d1 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Thu, 3 Oct 2013 13:00:35 -0700
Subject: Missed file

---
 .../default/xui/en/panel_experience_list_item.xml   | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_experience_list_item.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_experience_list_item.xml b/indra/newview/skins/default/xui/en/panel_experience_list_item.xml
new file mode 100644
index 0000000000..064f80a945
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_experience_list_item.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<panel
+  layout="topleft"
+  top="100"
+  left="5"
+  width="200"
+  height="19"
+  label="Experiences"
+  follows="top|right|left">
+  <text
+    left="0"
+    top="3"
+    height="16"
+    width="200"
+    follows="all"
+    name="experience_name"
+    >
+    Dummy Name
+  </text>
+</panel>
-- 
cgit v1.2.3


From 8add9a00f81b84f5268fc264f5871b04ae8547b8 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Mon, 14 Oct 2013 11:25:21 -0700
Subject: Updated strings for the experience list floater

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 15 +++++++--------
 indra/newview/skins/default/xui/en/strings.xml     | 10 +++++-----
 2 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 3b23b54d57..ad461a2991 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -52,14 +52,6 @@
          function="Inventory.NewWindow"
          parameter="" />
       </menu_item_call>
-      <menu_item_call
-        label="Experiences..."
-        name="Experiences"
-        shortcut="control|E">
-        <menu_item_call.on_click 
-          function="Floater.ToggleOrBringToFront"
-          parameter="experiences"/>
-      </menu_item_call>
       <menu_item_call
        label="Places..."
        name="Places">
@@ -74,6 +66,13 @@
          function="Floater.ToggleOrBringToFront"
          parameter="picks" />
       </menu_item_call>
+      <menu_item_call
+        label="Experiences..."
+        name="Experiences">
+        <menu_item_call.on_click 
+          function="Floater.ToggleOrBringToFront"
+          parameter="experiences"/>
+      </menu_item_call>
       <menu_item_separator/>
       <menu_item_call
        label="Camera Controls..."
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 530ed160bd..eda35474ac 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3927,11 +3927,11 @@ Try enclosing path to the editor with double quotes.
   <string name="experience_tools_experience">Experience</string>
   <string name="ExperienceNameNull">(no experience)</string>
   <string name="GRID_WIDE">Grid-wide</string>
-  <string name="Allowed_Experiences_Tab">Allowed</string>
-  <string name="Blocked_Experiences_Tab">Blocked</string>
-  <string name="Contrib_Experiences_Tab">Contributor</string>
-  <string name="Admin_Experiences_Tab">Admin</string>
-  <string name="Recent_Experiences_Tab">Recent</string>
+  <string name="Allowed_Experiences_Tab">ALLOWED</string>
+  <string name="Blocked_Experiences_Tab">BLOCKED</string>
+  <string name="Contrib_Experiences_Tab">CONTRIBUTOR</string>
+  <string name="Admin_Experiences_Tab">ADMIN</string>
+  <string name="Recent_Experiences_Tab">RECENT</string>
 
   <!-- Conversation log messages -->
   <string name="logging_calls_disabled_log_empty">
-- 
cgit v1.2.3


From 1aed2f848c4f2a86d6c2ea6385ebb920e7658aa8 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Tue, 15 Oct 2013 16:42:55 -0700
Subject: Added LLTabContainer::getTotalTabWidth Cleaned up experience profile
 floater

---
 .../default/xui/en/floater_experienceprofile.xml   | 145 +++++++++++++++------
 .../skins/default/xui/en/floater_experiences.xml   |   2 +-
 .../default/xui/en/panel_experience_list_item.xml  |   6 +-
 .../skins/default/xui/en/panel_experiences.xml     |   1 -
 4 files changed, 110 insertions(+), 44 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index ca9469474c..e70151c64e 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -6,9 +6,15 @@
   enabled="true"
   can_resize="true"
   title="EXPERIENCE PROFILE"
+  save_rect="true"
   min_width="325"
+  min_height="325"
   width="358"
   height="580">
+  <floater.string
+    name="empty_slurl">
+    (none)
+  </floater.string>
   <floater.string
     name="maturity_icon_general">
     "Parcel_PG_Light"
@@ -195,7 +201,7 @@
                 layout="topleft"
                 left="10"
                 name="ContentRating"
-                width="100">
+                width="75">
                 Rating:
               </text>
               <text
@@ -240,6 +246,7 @@
                 layout="topleft"
                 left="10"
                 valign="center"
+                use_ellipses="true"
                 name="LocationTextText"
                 width="288">
               </text>
@@ -272,13 +279,14 @@
                 layout="topleft"
                 left="10"
                 valign="center"
+                use_ellipses="true"
                 name="marketplace"
                 width="288">
               </text>
             </layout_panel>
             <layout_panel
               follows="left|top|right"
-              height="75"
+              height="18"
               left="0"
               top="0"
               auto_resize="false"
@@ -291,7 +299,7 @@
                 layout="topleft"
                 left="10"
                 name="Owner"
-                width="100">
+                width="75">
                 Owner:
               </text>
               <text
@@ -303,39 +311,85 @@
                 left_pad="2"
                 valign="center"
                 name="OwnerText"
+                use_ellipses="true"
                 top_delta="-2"
                 width="188">
               </text>
-              <button
-                follows="bottom|left"
-                height="23"
-                label="Allow"
+            </layout_panel>
+            <layout_panel
+              follows="all"
+              height="18"
+              layout="topleft"
+              left="0"
+              top="5"
+              width="313"
+              visible="false"
+              auto_resize="false"
+              name="group_panel">
+              <text
+                type="string"
+                length="1"
+                follows="left|top"
+                height="16"
                 layout="topleft"
-                name="allow_btn"
-                width="80"
-                top_pad="3"
                 left="10"
-                enabled="false"/>
-              <button
-                follows="bottom|left"
-                height="23"
-                label="Forget"
-                layout="topleft"
-                name="forget_btn"
-                width="80"
-                top_pad="-23"
-                left_pad="3"
-                enabled="false"/>
-              <button
-                follows="bottom|left"
-                height="23"
-                label="Block"
+                name="Group"
+                width="75">
+                Group:
+              </text>
+              <text
+                type="string"
+                length="1"
+                follows="left|top|right"
+                height="18"
                 layout="topleft"
-                name="block_btn"
-                width="80"
-                top_pad="-23"
-                left_pad="3"
-                enabled="false"/>
+                left_pad="2"
+                valign="center"
+                name="GroupText"
+                use_ellipses="true"
+                top_delta="-2"
+                width="188">
+              </text>
+            </layout_panel>
+            <layout_panel
+              follows="all"
+              height="33"
+              layout="topleft"
+              left="0"
+              top="5"
+              width="313"
+              auto_resize="false"
+              name="perm panel">
+            <button
+              follows="bottom|left"
+              height="23"
+              label="Allow"
+              layout="topleft"
+              name="allow_btn"
+              width="80"
+              top_pad="3"
+              left="10"
+              enabled="false"/>
+            <button
+              follows="bottom|left"
+              height="23"
+              label="Forget"
+              layout="topleft"
+              name="forget_btn"
+              width="80"
+              top_pad="-23"
+              left_pad="3"
+              enabled="false"/>
+            <button
+              follows="bottom|left"
+              height="23"
+              label="Block"
+              layout="topleft"
+              name="block_btn"
+              width="80"
+              top_pad="-23"
+              left_pad="3"
+              enabled="false"/>
 
             </layout_panel>
           </layout_stack>
@@ -436,7 +490,7 @@
             label="Moderate"
             layout="topleft"
             right="-10"
-            top_pad="-17"
+            top_pad="-19"
             name="edit_ContentRatingText"
             width="105">
             <icons_combo_box.drop_down_button
@@ -478,26 +532,39 @@
           <text
             type="string"
             length="1"
-            follows="left|top|right"
+            follows="left|top"
             height="14"
             layout="topleft"
             left="10"
             top_pad="10"
             name="edit_Location"
-            right="-10">
+            right="90">
             Location:
           </text>
-          <line_editor
+          <text
             type="string"
             length="1"
             follows="left|top|right"
-            height="19"
+            height="14"
             layout="topleft"
-            left="10"
-            max_length_bytes="255"
-            valign="center"
+            left_pad="5"
+            top_pad="-14"
             name="edit_LocationTextText"
-            right="-10"/>
+            right="-10">Location</text>
+          <button
+            left="10"
+            width="150"
+            height="23"
+            name="location_btn"
+            label="Set to Current"
+            />
+          <button
+            top_pad="-23"
+            follows="top|right"
+            right="-10"
+            width="80"
+            name="clear_btn"
+            label="Clear"/>
           <text
             type="string"
             length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_experiences.xml b/indra/newview/skins/default/xui/en/floater_experiences.xml
index 1258ce26ac..e727512b7f 100644
--- a/indra/newview/skins/default/xui/en/floater_experiences.xml
+++ b/indra/newview/skins/default/xui/en/floater_experiences.xml
@@ -9,7 +9,7 @@
   min_width="300"
   layout="topleft"
   name="floater_experiences"
-  save_rect="false"
+  save_rect="true"
   single_instance="true"
   reuse_instance="false"
   bg_opaque_color="0 0.5 0 0.3"
diff --git a/indra/newview/skins/default/xui/en/panel_experience_list_item.xml b/indra/newview/skins/default/xui/en/panel_experience_list_item.xml
index 064f80a945..a9777c51e7 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_list_item.xml
@@ -4,15 +4,15 @@
   layout="topleft"
   top="100"
   left="5"
-  width="200"
+  width="100"
   height="19"
   label="Experiences"
   follows="top|right|left">
   <text
-    left="0"
+    left="3"
     top="3"
     height="16"
-    width="200"
+    width="177"
     follows="all"
     name="experience_name"
     >
diff --git a/indra/newview/skins/default/xui/en/panel_experiences.xml b/indra/newview/skins/default/xui/en/panel_experiences.xml
index bc78d0813c..af264e73df 100644
--- a/indra/newview/skins/default/xui/en/panel_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_experiences.xml
@@ -12,7 +12,6 @@
   <string
     name="no_experiences"
     value="No experiences."/>
-
   <flat_list_view
     name="experiences_list"
     layout="topleft"
-- 
cgit v1.2.3


From fa344fdcd987ec66fa08f6286b504cb126c9a45c Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Thu, 17 Oct 2013 13:58:52 -0700
Subject: Updated experience profile to remove the permission buttons on
 privileged   experiences and fix the enabling of the save button with the
 checkbox controls.

---
 .../default/xui/en/floater_experienceprofile.xml   | 64 +++++++++++-----------
 1 file changed, 33 insertions(+), 31 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index e70151c64e..2b936b79c9 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -359,37 +359,38 @@
               top="5"
               width="313"
               auto_resize="false"
+              visible="false"
               name="perm panel">
-            <button
-              follows="bottom|left"
-              height="23"
-              label="Allow"
-              layout="topleft"
-              name="allow_btn"
-              width="80"
-              top_pad="3"
-              left="10"
-              enabled="false"/>
-            <button
-              follows="bottom|left"
-              height="23"
-              label="Forget"
-              layout="topleft"
-              name="forget_btn"
-              width="80"
-              top_pad="-23"
-              left_pad="3"
-              enabled="false"/>
-            <button
-              follows="bottom|left"
-              height="23"
-              label="Block"
-              layout="topleft"
-              name="block_btn"
-              width="80"
-              top_pad="-23"
-              left_pad="3"
-              enabled="false"/>
+              <button
+                follows="bottom|left"
+                height="23"
+                label="Allow"
+                layout="topleft"
+                name="allow_btn"
+                width="80"
+                top_pad="3"
+                left="10"
+                enabled="false"/>
+              <button
+                follows="bottom|left"
+                height="23"
+                label="Forget"
+                layout="topleft"
+                name="forget_btn"
+                width="80"
+                top_pad="-23"
+                left_pad="3"
+                enabled="false"/>
+              <button
+                follows="bottom|left"
+                height="23"
+                label="Block"
+                layout="topleft"
+                name="block_btn"
+                width="80"
+                top_pad="-23"
+                left_pad="3"
+                enabled="false"/>
 
             </layout_panel>
           </layout_stack>
@@ -549,8 +550,9 @@
             layout="topleft"
             left_pad="5"
             top_pad="-14"
+            use_ellipses="true"
             name="edit_LocationTextText"
-            right="-10">Location</text>
+            right="-10"></text>
           <button
             left="10"
             width="150"
-- 
cgit v1.2.3


From a6faeac94530e59d2c2a56df63a1d78e00fb0247 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Fri, 25 Oct 2013 09:48:41 -0700
Subject: Fixed the unintentional removal of experiences from teh list floater.
 Added a message to the UI for privileged experiences.

---
 .../skins/default/xui/en/floater_experienceprofile.xml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index 2b936b79c9..b823b338ad 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -353,13 +353,13 @@
             </layout_panel>
             <layout_panel
               follows="all"
-              height="33"
+              height="49"
               layout="topleft"
               left="0"
               top="5"
               width="313"
               auto_resize="false"
-              visible="false"
+              visible="true"
               name="perm panel">
               <button
                 follows="bottom|left"
@@ -391,7 +391,19 @@
                 top_pad="-23"
                 left_pad="3"
                 enabled="false"/>
-
+              <text
+                type="string"
+                length="1"
+                follows="left|top|right"
+                height="16"
+                layout="topleft"
+                left="10"
+                name="privileged"
+                use_ellipses="true"
+                visible="false"
+                right ="-10">
+                This experience is enabled for all residents.
+              </text>
             </layout_panel>
           </layout_stack>
         </panel>
-- 
cgit v1.2.3


From 1d8066890df4d8de9e60970037282beb9818788c Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Fri, 25 Oct 2013 14:04:24 -0700
Subject: Make the experience profile save button enable and disable as changes
 are made/reverted. Added some explanation text.

---
 .../skins/default/xui/en/floater_experienceprofile.xml      | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index b823b338ad..43ff3f07e4 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -504,6 +504,7 @@
             layout="topleft"
             right="-10"
             top_pad="-19"
+            tool_tip="Increasing the maturity rating on an experience will reset permission for all residents which have allowed the experience."
             name="edit_ContentRatingText"
             width="105">
             <icons_combo_box.drop_down_button
@@ -606,6 +607,7 @@
                      left="10"
                      layout="topleft"
                      follows="top|left"
+                     tool_tip=""
                      label="Enable Experience"
                      name="edit_enable_btn"/>
           <check_box width="130"
@@ -636,6 +638,17 @@
             width="120"
             right="-10"
             visible="true"/>
+          <text
+            follows="left|top|right"
+            height="50"
+            layout="topleft"
+            left="10"
+            top_pad="10"
+            name="changes"
+            use_ellipses="true"
+            word_wrap="true"
+            value="Experience changes may take several minutes to be seen on all regions."
+            right="-10"/>
         </panel>
       </scroll_container>
     </panel>
-- 
cgit v1.2.3


From b932dbd1193f911691e918f6bee96da88b3c71e5 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Thu, 5 Dec 2013 10:47:44 -0800
Subject: Added notification for experience declined due to maturity

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0f9a728116..0acdf100a4 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6985,10 +6985,22 @@ Is this OK?
        text="Block"/>
     </form>
   </notification>
+  <notification
+    icon="notify.tga"
+    name="ExperienceMaturityExceeded"
+    persist="false"
+    type="notify">
+You have declined participation in the following experience which exceeds your content ratings preferences:
+[EXPERIENCE_SLURL]
+    <form name="form">
+      <ignore name="ignore"
+              text="Experience declined due to content ratings"/>
+    </form>
+  </notification>
   <notification
    icon="notify.tga"
    name="ScriptQuestionExperience"
-   persist="true"
+   persist="false"
    type="notify">
 &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, an object owned by &apos;[NAME]&apos;, requests your participation in the [GRID_WIDE]experience:
 
-- 
cgit v1.2.3


From 88d0281121b4913f17931b8f5f537570b9198f29 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Tue, 28 Jan 2014 12:21:54 -0800
Subject: Added llFloaterExperiencePicker, mainly for use by region owners.

---
 .../default/xui/en/floater_experience_search.xml   | 170 +++++++++++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |   9 +-
 .../default/xui/en/panel_region_experiences.xml    |  15 ++
 3 files changed, 193 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_experience_search.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_region_experiences.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experience_search.xml b/indra/newview/skins/default/xui/en/floater_experience_search.xml
new file mode 100644
index 0000000000..4531b52d67
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_experience_search.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+  positioning="cascading"
+  legacy_header_height="18"
+  can_resize="true"
+  height="350"
+  layout="topleft"
+  min_height="200"
+  min_width="400"
+  name="experiencepicker"
+  help_topic="experiencepicker"
+  title="CHOOSE EXPERIENCE"
+  width="350">
+
+  <floater.string
+    name="not_found">
+    &apos;[TEXT]&apos; not found
+  </floater.string>
+  <floater.string
+    name="no_results">
+    No results
+  </floater.string>
+  <floater.string
+    name="searching">
+    Searching...
+  </floater.string>
+  <floater.string
+    name="loading">
+    Loading...
+  </floater.string>
+  <floater.string
+    name="maturity_icon_general">
+    "Parcel_PG_Light"
+  </floater.string>
+  <floater.string
+    name="maturity_icon_moderate">
+    "Parcel_M_Light"
+  </floater.string>
+  <floater.string
+    name="maturity_icon_adult">
+    "Parcel_R_Light"
+  </floater.string>
+  <panel
+    follows="all"
+    left="5"
+    right="-3"
+    bottom="-2"
+    top="18"
+    name="search_panel">
+    <text
+      left="0"
+      follows="top|left|right"
+      right="-1">
+      Enter part of the name:
+    </text>
+    <line_editor
+      left="0"
+      follows="left|top|right"
+      name="edit"
+      height="18"
+      right="-60"/>
+    <button label="Go"
+            follows="top|right"
+            top_pad="-18"
+            left_pad="2"
+            right="-1"
+            height="18"
+            name="find"/>
+    <text
+      top_pad="6"
+      left="0"
+      follows="top|left"
+      width="180">
+      Max Content Rating:
+    </text>
+    <icons_combo_box
+      follows="left|top"
+      height="20"
+      label="Moderate"
+      layout="topleft"
+      name="maturity"
+      top_pad="-13"
+      left_pad="0"
+      right="-1">
+      <icons_combo_box.drop_down_button
+        image_overlay="Parcel_M_Light"
+        image_overlay_alignment="left"
+        imgoverlay_label_space="3"
+        pad_left="3"/>
+      <icons_combo_box.item
+        label="Adult"
+        name="Adult"
+        value="42">
+        <item.columns
+          halign="center"
+          type="icon"
+          value="Parcel_R_Light"
+          width="20"/>
+      </icons_combo_box.item>
+      <icons_combo_box.item
+        label="Moderate"
+        name="Mature"
+        value="21">
+        <item.columns
+          halign="center"
+          type="icon"
+          value="Parcel_M_Light"
+          width="20"/>
+      </icons_combo_box.item>
+      <icons_combo_box.item
+        label="General"
+        name="PG"
+        value="13">
+        <item.columns
+          halign="center"
+          type="icon"
+          value="Parcel_PG_Light"
+          width="20"/>
+      </icons_combo_box.item>
+    </icons_combo_box>
+    <scroll_list
+      draw_heading="true"
+      left="0"
+      right="-1"
+      height="239"
+      top_pad="4"
+      follows="all"
+      column_padding="5"
+      can_resize="true"
+      name="search_results">
+      <columns
+        halign="center"
+        width="24"
+        name="maturity"
+        label=""/>
+      <columns
+        user_resize="true"
+        name="experience_name"
+        label="Name"/>
+      <columns
+        user_resize="true"
+        name="owner"
+        label="Owner"/>
+    </scroll_list>
+
+    <button
+      follows="left|bottom"
+      height="23"
+      label="OK"
+      label_selected="OK"
+      name="ok_btn"
+      top_pad="3"
+      left="0"
+      width="100" />
+    <button
+      follows="left|bottom"
+      height="23"
+      label="Cancel"
+      name="cancel_btn"
+      width="100"
+      left_pad="3" />
+    <button
+      follows="left|bottom"
+      height="23"
+      label="View Profile"
+      name="profile_btn"
+      width="100"
+      left_pad="3" />
+  </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 50d4003618..4be7dd2a5c 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -77,10 +77,17 @@
       <menu_item_call
         label="Experiences..."
         name="Experiences">
-        <menu_item_call.on_click 
+        <menu_item_call.on_click
           function="Floater.ToggleOrBringToFront"
           parameter="experiences"/>
       </menu_item_call>
+      <menu_item_call
+        label="Experience Search..."
+        name="Experience Search">
+        <menu_item_call.on_click
+          function="Floater.ToggleOrBringToFront"
+          parameter="experience_search"/>
+      </menu_item_call>
       <menu_item_separator/>
       <menu_item_call
        label="Camera Controls..."
diff --git a/indra/newview/skins/default/xui/en/panel_region_experiences.xml b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
new file mode 100644
index 0000000000..d3b3226619
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+  border="true"
+  follows="top|left"
+  height="510"
+  help_topic="panel_region_experience_tab"
+  label="Experience"
+  layout="topleft"
+  left="0"
+  name="Experience"
+  top="320"
+  width="530">
+
+
+</panel>
-- 
cgit v1.2.3


From d74119ec2bf5d98adce52291a2f82c1fed0aee30 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Tue, 4 Feb 2014 15:54:41 -0800
Subject: Added an experience tab to the region floater

---
 .../default/xui/en/floater_experience_search.xml   |  2 +-
 .../xui/en/panel_experience_list_editor.xml        | 63 ++++++++++++++++++
 .../default/xui/en/panel_region_experiences.xml    | 74 ++++++++++++++++++++--
 3 files changed, 133 insertions(+), 6 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_experience_list_editor.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experience_search.xml b/indra/newview/skins/default/xui/en/floater_experience_search.xml
index 4531b52d67..8b44dada40 100644
--- a/indra/newview/skins/default/xui/en/floater_experience_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_experience_search.xml
@@ -124,7 +124,7 @@
       right="-1"
       height="239"
       top_pad="4"
-      follows="all"
+      follows="all" 
       column_padding="5"
       can_resize="true"
       name="search_results">
diff --git a/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml
new file mode 100644
index 0000000000..acd9471916
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+  layout="topleft"
+  left="0"
+  top="0"
+  width="300"
+  height="100"
+  min_height="100"
+  follows="all"
+  border="true"
+  name="experince_list_editor">
+  <panel.string
+    name="loading">
+    loading...
+  </panel.string>
+  <panel.string
+    name="no_results">
+    (empty)
+  </panel.string>
+  <text
+    layout="topleft"
+    name="text_name"
+    left="3"
+    right="-1"
+    height="12"
+    follows="left|top|right">
+    Experience List
+  </text>
+  <scroll_list
+    draw_heading="false"
+    left="3"
+    width="225"
+    height="77"
+    follows="all"
+    can_resize="false"
+    name="experience_list">
+    <columns
+      width="225"
+      user_resize="false"
+      name="experience_name"
+      label="Name"/>
+  </scroll_list>
+  <button
+    layout="topleft"
+    follows="top|right"
+    top_pad="-77" 
+    left_pad="3"
+    width="65"
+    name="btn_add"
+    label="Add..."/>
+  <button
+    layout="topleft"
+    follows="top|right"
+    width="64"
+    name="btn_remove"
+    label="Remove"/>
+  <button
+    layout="topleft"
+    follows="top|right"
+    width="64"
+    name="btn_profile"
+    label="Profile..."/>
+</panel>
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 d3b3226619..f4d38c0e08 100644
--- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
@@ -2,14 +2,78 @@
 <panel
   border="true"
   follows="top|left"
-  height="510"
+  height="320"
   help_topic="panel_region_experience_tab"
-  label="Experience"
+  label="Experiences"
+  name="Experiences"
   layout="topleft"
   left="0"
-  name="Experience"
   top="320"
-  width="530">
-
+  width="480">
+  <panel.string
+    name="panel_allowed">
+    Allowed Experiences
+  </panel.string>
+  <panel.string
+    name="panel_blocked">
+    Blocked Experiences
+  </panel.string>
+  <panel.string
+    name="panel_trusted">
+    Trusted Experiences
+  </panel.string>
 
+  <layout_stack
+    left="5"
+    layout="topleft"
+    follows="all"
+    top="100"
+    right="-5"
+    height="140"
+    min_height="140"
+    orientation="vertical">
+    <layout_panel
+      height="100"
+      min_height="100"
+      width="530">
+      <panel follows="all"
+             width="530"
+             name="panel_trusted"
+             class="panel_experience_list_editor"
+             filename="panel_experience_list_editor.xml" />
+    </layout_panel>
+    <layout_panel
+      height="100"
+      min_height="100"
+      width="530">
+      <panel
+        label="SOME LABEL"
+        width="530"
+        name="panel_allowed"
+        class="panel_experience_list_editor"
+        filename="panel_experience_list_editor.xml"/>
+    </layout_panel>
+    <layout_panel
+      height="100"
+      min_height="100"
+      width="530">
+      <panel
+        width="530"
+        name="panel_blocked"
+        class="panel_experience_list_editor"
+        filename="panel_experience_list_editor.xml"/>
+    </layout_panel>
+    <layout_panel
+      height="30"
+      min_height="30"
+      max_height="30"
+      width="530">
+      <button
+        layout="topleft"
+        width="85"
+        left="3"
+        label="Apply"
+        name="apply_btn"/>
+    </layout_panel>
+  </layout_stack>
 </panel>
-- 
cgit v1.2.3


From 8b690a3fdfb24aea23150031768e0734043195aa Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Tue, 11 Feb 2014 15:25:00 -0800
Subject: Updated message for TeleportedHomeExperienceRemoved

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0acdf100a4..1afd56cc74 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6987,14 +6987,13 @@ Is this OK?
   </notification>
   <notification
     icon="notify.tga"
-    name="ExperienceMaturityExceeded"
-    persist="false"
+    name="TeleportedHomeExperienceRemoved"
+    persist="true"
     type="notify">
-You have declined participation in the following experience which exceeds your content ratings preferences:
-[EXPERIENCE_SLURL]
+    You have been teleported from the [region_name] for removing the experience secondlife:///app/experience/[public_id]/profile and are no longer permitted in the region.
     <form name="form">
       <ignore name="ignore"
-              text="Experience declined due to content ratings"/>
+              text="Kicked from region for removing an experience"/>
     </form>
   </notification>
   <notification
-- 
cgit v1.2.3


From 95523616b89dadd697eb6cfa3a466feadc1e1208 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Wed, 26 Feb 2014 13:55:32 -0800
Subject: Updated purchase UI for experiences.

---
 .../default/xui/en/panel_region_experiences.xml    | 39 ++++++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

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 f4d38c0e08..ee908348a3 100644
--- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
   border="true"
-  follows="top|left"
+  follows="all"
   height="320"
   help_topic="panel_region_experience_tab"
   label="Experiences"
@@ -27,11 +27,44 @@
     left="5"
     layout="topleft"
     follows="all"
-    top="100"
+    top="0"
     right="-5"
-    height="140"
+    height="320"
     min_height="140"
     orientation="vertical">
+    <layout_panel
+      layout="topleft"
+      height="100"
+      min_height="100"
+      width="530">
+      <text
+        layout="topleft"
+        follows="left|top"
+        height="18"
+        left="0"
+        top="4"
+        value="Your Experiences"
+        width="460"/>
+      <button
+        layout="topleft"
+        left="464"
+        top="4"
+        follows="top|right"
+        width="64"
+        name="btn_buy"
+        label="Buy"
+        enabled="false"/>
+      <panel
+        layout="topleft"
+        border="true"
+        left="0"
+        top="22"
+        height="74"
+        follows="all"
+        width="460"
+        name="panel_owned">        
+      </panel>      
+    </layout_panel>
     <layout_panel
       height="100"
       min_height="100"
-- 
cgit v1.2.3


From c1f730ed46c14c12d5856109b622bf085c39abb0 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Wed, 26 Feb 2014 17:32:21 -0800
Subject: Moved the experience acquire code to the experiences panel

---
 .../newview/skins/default/xui/en/notifications.xml | 15 ++++++
 .../skins/default/xui/en/panel_experiences.xml     | 53 ++++++++++++++++++----
 .../default/xui/en/panel_region_experiences.xml    | 33 --------------
 indra/newview/skins/default/xui/en/strings.xml     |  1 +
 4 files changed, 61 insertions(+), 41 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d473b8de00..75a7240c9e 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6985,6 +6985,21 @@ Is this OK?
        text="Block"/>
     </form>
   </notification>
+
+  <notification
+    icon="alertmodal.tga"
+    name="ExperienceAcquireFailed"
+    type="alertmodal">
+Unable to acquire a new experience:
+    [ERROR_MESSAGE]
+    <tag>fail</tag>
+    <usetemplate
+      name="okbutton"
+      yestext="OK"/>
+  </notification>
+  
+  
+  
   <notification
     icon="notify.tga"
     name="TeleportedHomeExperienceRemoved"
diff --git a/indra/newview/skins/default/xui/en/panel_experiences.xml b/indra/newview/skins/default/xui/en/panel_experiences.xml
index af264e73df..82b69fc344 100644
--- a/indra/newview/skins/default/xui/en/panel_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_experiences.xml
@@ -12,14 +12,51 @@
   <string
     name="no_experiences"
     value="No experiences."/>
-  <flat_list_view
-    name="experiences_list"
+  <string
+    name="acquire"
+    value="Acquire an Experience" />
+  <layout_stack
     layout="topleft"
     top="0"
-    left="0"
-    width="200"
-    height="300"
-    follows="all"
-    >
-  </flat_list_view>
+    left="4" 
+    right="-1"
+    bottom="-4"
+    orientation="vertical"
+    follows="all">
+    <layout_panel
+      layout="topleft"
+      top="0"
+      left="1"
+      right="-1"
+      height="250"
+      follows="all">
+      <flat_list_view
+        name="experiences_list"
+        layout="topleft"
+        top="0"
+        left="1"
+        right="-1"
+        bottom="-1"
+        follows="all">
+      </flat_list_view>
+    </layout_panel>
+    <layout_panel
+      layout="topleft"
+      top="0"
+      left="1"
+      right="-1"
+      height="24"
+      min_height="24"
+      follows="all"
+      name="button_panel"
+      visible="false">
+      <button
+        layout="topleft"
+        left="2"
+        top="0"
+        follows="top|left"
+        name="btn_action"
+        enabled="true"/>
+    </layout_panel>
+  </layout_stack>
 </panel>
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 ee908348a3..b7602f8fd3 100644
--- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
@@ -32,39 +32,6 @@
     height="320"
     min_height="140"
     orientation="vertical">
-    <layout_panel
-      layout="topleft"
-      height="100"
-      min_height="100"
-      width="530">
-      <text
-        layout="topleft"
-        follows="left|top"
-        height="18"
-        left="0"
-        top="4"
-        value="Your Experiences"
-        width="460"/>
-      <button
-        layout="topleft"
-        left="464"
-        top="4"
-        follows="top|right"
-        width="64"
-        name="btn_buy"
-        label="Buy"
-        enabled="false"/>
-      <panel
-        layout="topleft"
-        border="true"
-        left="0"
-        top="22"
-        height="74"
-        follows="all"
-        width="460"
-        name="panel_owned">        
-      </panel>      
-    </layout_panel>
     <layout_panel
       height="100"
       min_height="100"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index fed2d764d0..bf925e02f0 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3949,6 +3949,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Contrib_Experiences_Tab">CONTRIBUTOR</string>
   <string name="Admin_Experiences_Tab">ADMIN</string>
   <string name="Recent_Experiences_Tab">RECENT</string>
+  <string name="Owned_Experiences_Tab">OWNED</string>
 
   <!-- Conversation log messages -->
   <string name="logging_calls_disabled_log_empty">
-- 
cgit v1.2.3


From 49f08d775d3644bb47d342f8e37dd15051aeaa62 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Fri, 28 Feb 2014 16:21:42 -0800
Subject: Add group editing for experiences

---
 .../default/xui/en/floater_experienceprofile.xml   | 45 +++++++++++++++-------
 .../newview/skins/default/xui/en/notifications.xml | 21 ++++++++--
 2 files changed, 49 insertions(+), 17 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index 43ff3f07e4..fda84b0d4a 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -72,17 +72,16 @@
         <panel
           bg_alpha_color="DkGray2"
           follows="top|left|right"
-          height="480"
+          height="510"
           layout="topleft"
           left="0"
-          min_height="480"
           name="scrolling_panel"
           top="0"
           width="315"
           min_width="315">
           <layout_stack
             follows="all"
-            height="480"
+            height="510"
             layout="topleft"
             left="0"
             top="0"
@@ -421,7 +420,7 @@
       <scroll_container
         color="DkGray2"
         follows="all"
-        height="525"
+        height="520"
         layout="topleft"
         left="9"
         name="edit_xp_scroll"
@@ -431,7 +430,7 @@
         <panel
           bg_alpha_color="DkGray2"
           follows="top|left|right"
-          height="525"
+          height="590"
           layout="topleft"
           left="0"
           name="edit_scrolling_panel"
@@ -485,6 +484,25 @@
             text_color="black"
             right="-11"
             word_wrap="true"/>
+          <button
+            top_pad="10"
+            left="10"
+            width="125"
+            height="23"
+            name="Group_btn"
+            label="Group"
+            />
+          <text
+            type="string"
+            length="1"
+            follows="left|top|right"
+            height="14"
+            layout="topleft"
+            left_pad="10"
+            top_pad="-18"
+            use_ellipses="true"
+            name="edit_GroupText"
+            right="-10" />
           <text
             top_pad="10"
             type="string"
@@ -565,10 +583,10 @@
             top_pad="-14"
             use_ellipses="true"
             name="edit_LocationTextText"
-            right="-10"></text>
+            right="-10" />
           <button
             left="10"
-            width="150"
+            width="125"
             height="23"
             name="location_btn"
             label="Set to Current"
@@ -577,9 +595,9 @@
             top_pad="-23"
             follows="top|right"
             right="-10"
-            width="80"
+            width="125"
             name="clear_btn"
-            label="Clear"/>
+            label="Clear Location"/>
           <text
             type="string"
             length="1"
@@ -610,10 +628,11 @@
                      tool_tip=""
                      label="Enable Experience"
                      name="edit_enable_btn"/>
-          <check_box width="130"
+          <check_box width="125"
                      height="21"
                      top_pad="-21"
                      right="-10"
+                     visible="false"
                      layout="topleft"
                      follows="top|left|right"
                      label="Hide In Search"
@@ -624,7 +643,7 @@
             label="Back"
             layout="topleft"
             name="cancel_btn"
-            width="120"
+            width="125"
             top_pad="15"
             left="10"
             visible="true"/>
@@ -635,12 +654,12 @@
             layout="topleft"
             name="save_btn"
             top_pad="-23"
-            width="120"
+            width="125"
             right="-10"
             visible="true"/>
           <text
             follows="left|top|right"
-            height="50"
+            height="25"
             layout="topleft"
             left="10"
             top_pad="10"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 75a7240c9e..0da1e546ee 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6997,20 +6997,33 @@ Unable to acquire a new experience:
       name="okbutton"
       yestext="OK"/>
   </notification>
-  
-  
-  
+
+
+
   <notification
     icon="notify.tga"
     name="TeleportedHomeExperienceRemoved"
     persist="true"
     type="notify">
-    You have been teleported from the [region_name] for removing the experience secondlife:///app/experience/[public_id]/profile and are no longer permitted in the region.
+    You have been teleported from the region [region_name] for removing the experience secondlife:///app/experience/[public_id]/profile and are no longer permitted in the region.
     <form name="form">
       <ignore name="ignore"
               text="Kicked from region for removing an experience"/>
     </form>
   </notification>
+
+  <notification
+    icon="notify.tga"
+    name="TrustedExperienceEntry"
+    persist="true"
+    type="notify">
+    You have been allowed into the region [region_name] by participating in the trusted experience secondlife:///app/experience/[public_id]/profile removing this experience may kick you from the region.
+    <form name="form">
+      <ignore name="ignore"
+              text="Allowed into a region by an experience"/>
+    </form>
+  </notification>
+  
   <notification
    icon="notify.tga"
    name="ScriptQuestionExperience"
-- 
cgit v1.2.3


From 7b9817cbcc5acab58d9d4355984b429850bd3ef8 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Mon, 10 Mar 2014 10:15:19 -0700
Subject: Fixed a bug that lost callbacks if > 10 experiences were looked up at
 a time.

---
 indra/newview/skins/default/xui/en/floater_experienceprofile.xml | 4 ++--
 indra/newview/skins/default/xui/en/floater_live_lsleditor.xml    | 4 ++++
 indra/newview/skins/default/xui/en/notifications.xml             | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index fda84b0d4a..fa4e6c02db 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -10,7 +10,7 @@
   min_width="325"
   min_height="325"
   width="358"
-  height="580">
+  height="660">
   <floater.string
     name="empty_slurl">
     (none)
@@ -42,7 +42,7 @@
   <tab_container
     hide_tabs="true"
     follows="all"
-    height="540"
+    height="620"
     layout="topleft"
     left="5"
     min_height="250"
diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
index d8c2a753a1..40b47dc1d7 100755
--- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
@@ -37,6 +37,10 @@
     name="add_experiences">
     Select to add an experience
   </floater.string>
+  <floater.string
+    name="loading">
+    Loading...
+  </floater.string>
   <panel
     bevel_style="none"
      
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0da1e546ee..9482ebb520 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7003,7 +7003,7 @@ Unable to acquire a new experience:
   <notification
     icon="notify.tga"
     name="TeleportedHomeExperienceRemoved"
-    persist="true"
+    persist="false"
     type="notify">
     You have been teleported from the region [region_name] for removing the experience secondlife:///app/experience/[public_id]/profile and are no longer permitted in the region.
     <form name="form">
@@ -7015,7 +7015,7 @@ Unable to acquire a new experience:
   <notification
     icon="notify.tga"
     name="TrustedExperienceEntry"
-    persist="true"
+    persist="false"
     type="notify">
     You have been allowed into the region [region_name] by participating in the trusted experience secondlife:///app/experience/[public_id]/profile removing this experience may kick you from the region.
     <form name="form">
-- 
cgit v1.2.3


From 9fe5728b4385ead4a4c74eed7917d93060510cdb Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Wed, 12 Mar 2014 09:50:08 -0700
Subject: Show ignored items when updating an experience profile

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b7d5940434..e0cc2229d5 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7006,8 +7006,46 @@ Unable to acquire a new experience:
       yestext="OK"/>
   </notification>
 
+  <notification
+    icon="notify.tga"
+    name="NotInGroupExperienceProfileMessage"
+    persist="false"
+    type="notify">
+    A change to the experience group was ignored because the owner is not a member of the selected group.
+  </notification>
+
+  <notification
+    icon="notify.tga"
+    name="UneditableExperienceProfileMessage"
+    persist="false"
+    type="notify">
+    The uneditable field '[field]' was ignored when updating the experience profile.
+  </notification>
+
+  <notification
+    icon="notify.tga"
+    name="RestrictedToOwnerExperienceProfileMessage"
+    persist="false"
+    type="notify">
+    Ignored changes to the field '[field]' which can only be set by the experience owner.
+  </notification>
 
+  <notification
+    icon="notify.tga"
+    name="MaturityRatingExceedsOwnerExperienceProfileMessage"
+    persist="false"
+    type="notify">
+    You may not set the maturity rating of an experience higher than that of the owner.
+  </notification>
 
+  <notification
+    icon="notify.tga"
+    name="RestrictedTermExperienceProfileMessage"
+    persist="false"
+    type="notify">
+    The following terms prevented the update of the experience profile name and/or description: [extra_info]
+  </notification>
+  
   <notification
     icon="notify.tga"
     name="TeleportedHomeExperienceRemoved"
-- 
cgit v1.2.3


From e10ae3ba960cf030582378c454937dd326fcd436 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Thu, 13 Mar 2014 15:10:51 -0700
Subject: Added a Report Abuse button to the experience profile

---
 .../default/xui/en/floater_experienceprofile.xml   | 35 ++++++++++++++--------
 1 file changed, 23 insertions(+), 12 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index fa4e6c02db..67a7d5dad0 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -10,7 +10,7 @@
   min_width="325"
   min_height="325"
   width="358"
-  height="660">
+  height="650">
   <floater.string
     name="empty_slurl">
     (none)
@@ -42,7 +42,7 @@
   <tab_container
     hide_tabs="true"
     follows="all"
-    height="620"
+    height="615"
     layout="topleft"
     left="5"
     min_height="250"
@@ -52,7 +52,7 @@
     <panel
       background_visible="true"
       follows="all"
-      height="550"
+      height="540"
       layout="topleft"
       left="0"
       min_height="250"
@@ -62,7 +62,7 @@
       <scroll_container
         color="DkGray2"
         follows="all"
-        height="532"
+        height="520"
         layout="topleft"
         left="9"
         name="xp_scroll"
@@ -72,7 +72,7 @@
         <panel
           bg_alpha_color="DkGray2"
           follows="top|left|right"
-          height="510"
+          height="550"
           layout="topleft"
           left="0"
           name="scrolling_panel"
@@ -81,9 +81,10 @@
           min_width="315">
           <layout_stack
             follows="all"
-            height="510"
+            height="550"
             layout="topleft"
             left="0"
+            animate="false"
             top="0"
             orientation="vertical"
             width="315">
@@ -352,7 +353,7 @@
             </layout_panel>
             <layout_panel
               follows="all"
-              height="49"
+              height="75"
               layout="topleft"
               left="0"
               top="5"
@@ -366,7 +367,7 @@
                 label="Allow"
                 layout="topleft"
                 name="allow_btn"
-                width="80"
+                width="94"
                 top_pad="3"
                 left="10"
                 enabled="false"/>
@@ -376,7 +377,7 @@
                 label="Forget"
                 layout="topleft"
                 name="forget_btn"
-                width="80"
+                width="94"
                 top_pad="-23"
                 left_pad="3"
                 enabled="false"/>
@@ -386,23 +387,33 @@
                 label="Block"
                 layout="topleft"
                 name="block_btn"
-                width="80"
+                width="94"
                 top_pad="-23"
                 left_pad="3"
                 enabled="false"/>
               <text
                 type="string"
+                halign="center"
                 length="1"
                 follows="left|top|right"
                 height="16"
                 layout="topleft"
                 left="10"
                 name="privileged"
-                use_ellipses="true"
                 visible="false"
-                right ="-10">
+                width="288">
                 This experience is enabled for all residents.
               </text>
+              <button
+                follows="bottom|left"
+                height="23"
+                label="Report Abuse"
+                layout="topleft"
+                name="report_btn"
+                width="288"
+                top_pad="3"
+                left="10"
+                enabled="true"/>
             </layout_panel>
           </layout_stack>
         </panel>
-- 
cgit v1.2.3


From b2591ca63c498ab606bf595e0b2e729e76caea24 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Tue, 18 Mar 2014 14:12:22 -0700
Subject: Added a default message handler for experience logs. Currently just
 forwards the   notification.

---
 indra/newview/skins/default/xui/en/notifications.xml | 20 ++++++++++++++++++++
 indra/newview/skins/default/xui/en/strings.xml       | 10 +++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e0cc2229d5..b230e36cc7 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7069,6 +7069,26 @@ Unable to acquire a new experience:
               text="Allowed into a region by an experience"/>
     </form>
   </notification>
+
+  <notification
+    icon="notify.tga"
+    name="ExperienceEvent"
+    persist="false"
+    type="notify">
+    An object was allowed to [EventType] by the secondlife:///app/experience/[public_id]/profile experience.
+    Owner: secondlife:///app/agent/[OwnerID]/inspect
+    Object Name: [ObjectName]
+    Parcel Name: [ParcelName]
+  </notification>
+
+  <notification
+    icon="notify.tga"
+    name="ExperienceEventAttachment"
+    persist="false"
+    type="notify">
+    An attachment was allowed to [EventType] by the secondlife:///app/experience/[public_id]/profile experience.
+    Owner: secondlife:///app/agent/[OwnerID]/inspect
+  </notification>
   
   <notification
    icon="notify.tga"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 5badeff38b..dc9e96e2f2 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3985,7 +3985,15 @@ Try enclosing path to the editor with double quotes.
   <string name="Admin_Experiences_Tab">ADMIN</string>
   <string name="Recent_Experiences_Tab">RECENT</string>
   <string name="Owned_Experiences_Tab">OWNED</string>
-
+  <string name="ExperiencePermission1">take over your controls</string>
+  <string name="ExperiencePermission3">override animations on your avatar</string>
+  <string name="ExperiencePermission4">attach to your avatar</string>
+  <string name="ExperiencePermission9">track your camera</string>
+  <string name="ExperiencePermission10">control your camera</string>
+  <string name="ExperiencePermission11">teleport you</string>
+  <string name="ExperiencePermission12">automatically accept experience permissions</string>
+  <string name="ExperiencePermissionUnknown">perform an unknown operation: [Permission]</string>
+  
   <!-- Conversation log messages -->
   <string name="logging_calls_disabled_log_empty">
     Conversations are not being logged. To begin keeping a log, choose "Save: Log only" or "Save: Log and transcripts" under Preferences > Chat.
-- 
cgit v1.2.3


From dba034ee100dae4b62ddf12523835a413a25f189 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Thu, 20 Mar 2014 16:32:31 -0700
Subject: Experience log panel

---
 .../default/xui/en/floater_experienceprofile.xml   |   4 +-
 .../newview/skins/default/xui/en/notifications.xml |   4 +-
 .../skins/default/xui/en/panel_experience_log.xml  | 152 +++++++++++++++++++++
 indra/newview/skins/default/xui/en/strings.xml     |  10 +-
 4 files changed, 165 insertions(+), 5 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_experience_log.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index 67a7d5dad0..c6a749b45f 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -410,9 +410,9 @@
                 label="Report Abuse"
                 layout="topleft"
                 name="report_btn"
-                width="288"
+                width="94"
                 top_pad="3"
-                left="10"
+                left="107"
                 enabled="true"/>
             </layout_panel>
           </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b230e36cc7..edcc401b9a 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7074,7 +7074,7 @@ Unable to acquire a new experience:
     icon="notify.tga"
     name="ExperienceEvent"
     persist="false"
-    type="notify">
+    type="notifytip">
     An object was allowed to [EventType] by the secondlife:///app/experience/[public_id]/profile experience.
     Owner: secondlife:///app/agent/[OwnerID]/inspect
     Object Name: [ObjectName]
@@ -7085,7 +7085,7 @@ Unable to acquire a new experience:
     icon="notify.tga"
     name="ExperienceEventAttachment"
     persist="false"
-    type="notify">
+    type="notifytip">
     An attachment was allowed to [EventType] by the secondlife:///app/experience/[public_id]/profile experience.
     Owner: secondlife:///app/agent/[OwnerID]/inspect
   </notification>
diff --git a/indra/newview/skins/default/xui/en/panel_experience_log.xml b/indra/newview/skins/default/xui/en/panel_experience_log.xml
new file mode 100644
index 0000000000..6869a135d8
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_experience_log.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<panel
+  layout="topleft"
+  top="3"
+  left="3"
+  width="500"
+  height="300"
+  label="EVENTS"
+  bg_opaque_color="0 0.5 0 0.3"
+  follows="all">
+  <string
+    name="no_events"
+    value="No events."/>
+  <string
+    name="loading"
+    value="loading..."/>
+  <layout_stack
+    layout="topleft"
+    top="0"
+    left="4" 
+    right="-1"
+    bottom="-4"
+    orientation="vertical"
+    follows="all">
+    <layout_panel
+      layout="topleft"
+      top="0"
+      left="1"
+      right="-1"
+      height="250"
+      follows="all">
+      <scroll_list
+        draw_heading="true"
+        left="1"
+        right="-86"
+        height="250"
+        follows="all"
+        name="experience_log_list">
+        <columns
+          width="100"
+          user_resize="true"
+          name="time"
+          label="Time"/>
+        <columns
+          width="100"
+          user_resize="true"
+          name="event"
+          label="Event"/>
+        <columns
+          width="100"
+          user_resize="true"
+          name="experience_name"
+          label="Experience"/>
+        <columns
+          width="100"
+          user_resize="true"
+          name="object_name"
+          label="Object"/>
+      </scroll_list>
+      
+      <button
+        layout="topleft"
+        follows="top|right"
+        name="btn_notify"
+        label="Notify"
+        top_pad="-225"
+        left_pad="5"
+        right="-1"
+        enabled="false"/>
+      
+      <button
+        layout="topleft"
+        follows="top|right"
+        name="btn_profile_xp"
+        label="Profile"
+        top_pad="5"
+        right="-1"
+        enabled="false"/>
+
+      <button
+        layout="topleft"
+        follows="top|right"
+        name="btn_report_xp"
+        label="Report"
+        top_pad="5"
+        right="-1"
+        enabled="false"/>
+    </layout_panel>
+    <layout_panel
+      layout="topleft"
+      top="0"
+      left="1"
+      right="-1"
+      height="30"
+      min_height="30"
+      follows="all"
+      name="button_panel"
+      visible="true">
+      <check_box
+        top="0"
+        follows="top|left"
+        height="26"
+        label="Notify All Events   Days"
+        width="140"
+        name="notify_all" />
+
+      <spinner
+        top="5"
+        control_name="LogDays"
+        decimal_digits="0"
+        follows="left|top"
+        height="23"
+        increment="1"
+        initial_value="7"
+        label_width="30"
+        layout="topleft"
+        left_pad="5"
+        max_val="14"
+        min_val="0"
+        name="logsizespinner"
+        width="40" />
+      <button
+        top="5"
+        left="280"
+        layout="topleft"
+        follows="top|left"
+        name="btn_clear"
+        label="Clear"
+        width="80"
+        enabled="false"/>
+      <button
+        top="5"
+        layout="topleft"
+        left_pad="5"
+        width="20"
+        follows="top|left"
+        name="btn_prev"
+        label="&lt;"
+        enabled="false"/>
+      <button
+        top="5"
+        layout="topleft"
+        follows="top|left"
+        name="btn_next"
+        label="&gt;"
+        left_pad="5"
+        width="20"
+        enabled="false"/>
+    </layout_panel>
+  </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index dc9e96e2f2..37aaf941af 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3992,7 +3992,15 @@ Try enclosing path to the editor with double quotes.
   <string name="ExperiencePermission10">control your camera</string>
   <string name="ExperiencePermission11">teleport you</string>
   <string name="ExperiencePermission12">automatically accept experience permissions</string>
-  <string name="ExperiencePermissionUnknown">perform an unknown operation: [Permission]</string>
+  <string name="ExperiencePermissionShortUnknown">perform an unknown operation: [Permission]</string>
+  <string name="ExperiencePermissionShort1">Take Controls</string>
+  <string name="ExperiencePermissionShort3">Override Animations</string>
+  <string name="ExperiencePermissionShort4">Attach</string>
+  <string name="ExperiencePermissionShort9">Track Camera</string>
+  <string name="ExperiencePermissionShort10">Control Camera</string>
+  <string name="ExperiencePermissionShort11">Teleport</string>
+  <string name="ExperiencePermissionShort12">Permission</string>
+  <string name="ExperiencePermissionShortUnknown">Unknown: [Permission]</string>
   
   <!-- Conversation log messages -->
   <string name="logging_calls_disabled_log_empty">
-- 
cgit v1.2.3


From 37411bc7ebc5a34e8c9a5c43471291224a3cd35a Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Fri, 21 Mar 2014 16:58:43 -0700
Subject: Experience log panel is live and updates as new events come in.
 Multiple identical events get collapsed int a single entry.

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 37aaf941af..a17a895b42 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3986,7 +3986,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Recent_Experiences_Tab">RECENT</string>
   <string name="Owned_Experiences_Tab">OWNED</string>
   <string name="ExperiencePermission1">take over your controls</string>
-  <string name="ExperiencePermission3">override animations on your avatar</string>
+  <string name="ExperiencePermission3">trigger animations on your avatar</string>
   <string name="ExperiencePermission4">attach to your avatar</string>
   <string name="ExperiencePermission9">track your camera</string>
   <string name="ExperiencePermission10">control your camera</string>
@@ -3994,7 +3994,7 @@ Try enclosing path to the editor with double quotes.
   <string name="ExperiencePermission12">automatically accept experience permissions</string>
   <string name="ExperiencePermissionShortUnknown">perform an unknown operation: [Permission]</string>
   <string name="ExperiencePermissionShort1">Take Controls</string>
-  <string name="ExperiencePermissionShort3">Override Animations</string>
+  <string name="ExperiencePermissionShort3">Trigger Animations</string>
   <string name="ExperiencePermissionShort4">Attach</string>
   <string name="ExperiencePermissionShort9">Track Camera</string>
   <string name="ExperiencePermissionShort10">Control Camera</string>
-- 
cgit v1.2.3


From a8a0506b35667b76bf7bdbea6984909588cb7bbc Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Fri, 4 Apr 2014 16:30:04 -0700
Subject: Changed estate experience editing to use sendEstateOwnerMessage

---
 indra/newview/skins/default/xui/en/panel_experience_info.xml |  2 +-
 .../skins/default/xui/en/panel_region_experiences.xml        | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_experience_info.xml b/indra/newview/skins/default/xui/en/panel_experience_info.xml
index 268e7462c1..70d8a4fc64 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_info.xml
@@ -111,7 +111,7 @@
             left="7"
             name="experience_description"
             top="0"
-            value="It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. It is mainly just a lot of men in tights on patrol for evil-doers. "
+            value=""
             width="293"/>
         </layout_panel>
         <layout_panel
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 b7602f8fd3..57c87d197f 100644
--- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
@@ -63,17 +63,5 @@
         class="panel_experience_list_editor"
         filename="panel_experience_list_editor.xml"/>
     </layout_panel>
-    <layout_panel
-      height="30"
-      min_height="30"
-      max_height="30"
-      width="530">
-      <button
-        layout="topleft"
-        width="85"
-        left="3"
-        label="Apply"
-        name="apply_btn"/>
-    </layout_panel>
   </layout_stack>
 </panel>
-- 
cgit v1.2.3


From 2206f97d8efb2683e6c0d759a8549de9de67a054 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 23 Apr 2014 22:19:20 +0100
Subject: Added SEARCH tab to Experience floater for ACME-1420

---
 .../default/xui/en/panel_experience_search.xml     | 152 +++++++++++++++++++++
 1 file changed, 152 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_experience_search.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_experience_search.xml b/indra/newview/skins/default/xui/en/panel_experience_search.xml
new file mode 100644
index 0000000000..5593cef591
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_experience_search.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+  layout="topleft"
+  top="3"
+  left="3"
+  width="350"
+  height="350"
+  label="SEARCH"
+  bg_opaque_color="0 0.5 0 0.3"
+  follows="all">
+
+  <string
+    name="not_found">
+    &apos;[TEXT]&apos; not found
+  </string>
+  <string
+    name="no_results">
+    No results
+  </string>
+  <string
+    name="searching">
+    Searching...
+  </string>
+  <string
+    name="loading">
+    Loading...
+  </string>
+  <string
+    name="maturity_icon_general">
+    "Parcel_PG_Light"
+  </string>
+  <string
+    name="maturity_icon_moderate">
+    "Parcel_M_Light"
+  </string>
+  <string
+    name="maturity_icon_adult">
+    "Parcel_R_Light"
+  </string>
+  <panel
+    follows="all"
+    left="5"
+    right="-3"
+    bottom="-2"
+    top="18"
+    name="search_panel">
+    <text
+      left="0"
+      follows="top|left|right"
+      right="-1">
+      Enter part of the name:
+    </text>
+    <line_editor
+      left="0"
+      follows="left|top|right"
+      name="edit"
+      height="18"
+      right="-60"/>
+    <button label="Go"
+            follows="top|right"
+            top_pad="-18"
+            left_pad="2"
+            right="-1"
+            height="18"
+            name="find"/>
+    <text
+      top_pad="6"
+      left="0"
+      follows="top|left"
+      width="180">
+      Max Content Rating:
+    </text>
+    <icons_combo_box
+      follows="left|top"
+      height="20"
+      label="Moderate"
+      layout="topleft"
+      name="maturity"
+      top_pad="-13"
+      left_pad="0"
+      right="-1">
+      <icons_combo_box.drop_down_button
+        image_overlay="Parcel_M_Light"
+        image_overlay_alignment="left"
+        imgoverlay_label_space="3"
+        pad_left="3"/>
+      <icons_combo_box.item
+        label="Adult"
+        name="Adult"
+        value="42">
+        <item.columns
+          halign="center"
+          type="icon"
+          value="Parcel_R_Light"
+          width="20"/>
+      </icons_combo_box.item>
+      <icons_combo_box.item
+        label="Moderate"
+        name="Mature"
+        value="21">
+        <item.columns
+          halign="center"
+          type="icon"
+          value="Parcel_M_Light"
+          width="20"/>
+      </icons_combo_box.item>
+      <icons_combo_box.item
+        label="General"
+        name="PG"
+        value="13">
+        <item.columns
+          halign="center"
+          type="icon"
+          value="Parcel_PG_Light"
+          width="20"/>
+      </icons_combo_box.item>
+    </icons_combo_box>
+    <scroll_list
+      draw_heading="true"
+      left="0"
+      right="-1"
+      height="239"
+      top_pad="4"
+      follows="all" 
+      column_padding="5"
+      can_resize="true"
+      name="search_results">
+      <columns
+        halign="center"
+        width="24"
+        name="maturity"
+        label=""/>
+      <columns
+        user_resize="true"
+        name="experience_name"
+        label="Name"/>
+      <columns
+        user_resize="true"
+        name="owner"
+        label="Owner"/>
+    </scroll_list>
+
+    <button
+      follows="left|bottom"
+      height="23"
+      label="View Profile"
+      name="profile_btn"
+      top_pad="3"
+      left="0"
+      width="100"/>
+  </panel>
+</panel>
-- 
cgit v1.2.3


From 80fcd6d9d42377fc09928eb99f26e6287c4b544d Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Thu, 24 Apr 2014 14:00:15 -0700
Subject: If an agent fails to teleport into a region with trusted experiences
 and they pass all other checks then a list of experiences will be presented
 to them.

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d20d94d619..5e966395dc 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7070,6 +7070,17 @@ Unable to acquire a new experience:
     </form>
   </notification>
 
+  <notification
+    icon="notify.tga"
+    name="TrustedExperiencesAvailable"
+    persist="false"
+    type="notify">
+You do not have access to this destination. You may be allowed into the region by Accepting an experience below:
+
+[EXPERIENCE_LIST]
+  </notification>
+    
+
   <notification
     icon="notify.tga"
     name="ExperienceEvent"
-- 
cgit v1.2.3


From 446a3193b1f2932ed14a16216bcf65dc30889612 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Thu, 24 Apr 2014 23:43:54 +0100
Subject: Refactored to share code between experience search floater and panel
 for ACME-1420

---
 .../default/xui/en/floater_experience_search.xml   | 156 +--------------------
 indra/newview/skins/default/xui/en/menu_viewer.xml |   7 -
 .../default/xui/en/panel_experience_search.xml     |  30 ++--
 3 files changed, 25 insertions(+), 168 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experience_search.xml b/indra/newview/skins/default/xui/en/floater_experience_search.xml
index 8b44dada40..7d7e3ba95a 100644
--- a/indra/newview/skins/default/xui/en/floater_experience_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_experience_search.xml
@@ -12,159 +12,9 @@
   title="CHOOSE EXPERIENCE"
   width="350">
 
-  <floater.string
-    name="not_found">
-    &apos;[TEXT]&apos; not found
-  </floater.string>
-  <floater.string
-    name="no_results">
-    No results
-  </floater.string>
-  <floater.string
-    name="searching">
-    Searching...
-  </floater.string>
-  <floater.string
-    name="loading">
-    Loading...
-  </floater.string>
-  <floater.string
-    name="maturity_icon_general">
-    "Parcel_PG_Light"
-  </floater.string>
-  <floater.string
-    name="maturity_icon_moderate">
-    "Parcel_M_Light"
-  </floater.string>
-  <floater.string
-    name="maturity_icon_adult">
-    "Parcel_R_Light"
-  </floater.string>
   <panel
+    filename="panel_experience_search.xml"
+    class="llpanelexperiencepicker"
     follows="all"
-    left="5"
-    right="-3"
-    bottom="-2"
-    top="18"
-    name="search_panel">
-    <text
-      left="0"
-      follows="top|left|right"
-      right="-1">
-      Enter part of the name:
-    </text>
-    <line_editor
-      left="0"
-      follows="left|top|right"
-      name="edit"
-      height="18"
-      right="-60"/>
-    <button label="Go"
-            follows="top|right"
-            top_pad="-18"
-            left_pad="2"
-            right="-1"
-            height="18"
-            name="find"/>
-    <text
-      top_pad="6"
-      left="0"
-      follows="top|left"
-      width="180">
-      Max Content Rating:
-    </text>
-    <icons_combo_box
-      follows="left|top"
-      height="20"
-      label="Moderate"
-      layout="topleft"
-      name="maturity"
-      top_pad="-13"
-      left_pad="0"
-      right="-1">
-      <icons_combo_box.drop_down_button
-        image_overlay="Parcel_M_Light"
-        image_overlay_alignment="left"
-        imgoverlay_label_space="3"
-        pad_left="3"/>
-      <icons_combo_box.item
-        label="Adult"
-        name="Adult"
-        value="42">
-        <item.columns
-          halign="center"
-          type="icon"
-          value="Parcel_R_Light"
-          width="20"/>
-      </icons_combo_box.item>
-      <icons_combo_box.item
-        label="Moderate"
-        name="Mature"
-        value="21">
-        <item.columns
-          halign="center"
-          type="icon"
-          value="Parcel_M_Light"
-          width="20"/>
-      </icons_combo_box.item>
-      <icons_combo_box.item
-        label="General"
-        name="PG"
-        value="13">
-        <item.columns
-          halign="center"
-          type="icon"
-          value="Parcel_PG_Light"
-          width="20"/>
-      </icons_combo_box.item>
-    </icons_combo_box>
-    <scroll_list
-      draw_heading="true"
-      left="0"
-      right="-1"
-      height="239"
-      top_pad="4"
-      follows="all" 
-      column_padding="5"
-      can_resize="true"
-      name="search_results">
-      <columns
-        halign="center"
-        width="24"
-        name="maturity"
-        label=""/>
-      <columns
-        user_resize="true"
-        name="experience_name"
-        label="Name"/>
-      <columns
-        user_resize="true"
-        name="owner"
-        label="Owner"/>
-    </scroll_list>
-
-    <button
-      follows="left|bottom"
-      height="23"
-      label="OK"
-      label_selected="OK"
-      name="ok_btn"
-      top_pad="3"
-      left="0"
-      width="100" />
-    <button
-      follows="left|bottom"
-      height="23"
-      label="Cancel"
-      name="cancel_btn"
-      width="100"
-      left_pad="3" />
-    <button
-      follows="left|bottom"
-      height="23"
-      label="View Profile"
-      name="profile_btn"
-      width="100"
-      left_pad="3" />
-  </panel>
+    name="panel_experience_search"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f33acc75b2..a9f83e751a 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -81,13 +81,6 @@
           function="Floater.ToggleOrBringToFront"
           parameter="experiences"/>
       </menu_item_call>
-      <menu_item_call
-        label="Experience Search..."
-        name="Experience Search">
-        <menu_item_call.on_click
-          function="Floater.ToggleOrBringToFront"
-          parameter="experience_search"/>
-      </menu_item_call>
       <menu_item_separator/>
       <menu_item_call
        label="Camera Controls..."
diff --git a/indra/newview/skins/default/xui/en/panel_experience_search.xml b/indra/newview/skins/default/xui/en/panel_experience_search.xml
index 5593cef591..5ac7f6b239 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_search.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
   layout="topleft"
-  top="3"
-  left="3"
+  top="18"
+  left="0"
   width="350"
-  height="350"
+  height="330"
   label="SEARCH"
-  bg_opaque_color="0 0.5 0 0.3"
   follows="all">
 
   <string
@@ -42,7 +41,7 @@
     left="5"
     right="-3"
     bottom="-2"
-    top="18"
+    top="0"
     name="search_panel">
     <text
       left="0"
@@ -143,10 +142,25 @@
     <button
       follows="left|bottom"
       height="23"
-      label="View Profile"
-      name="profile_btn"
+      label="OK"
+      label_selected="OK"
+      name="ok_btn"
       top_pad="3"
       left="0"
-      width="100"/>
+      width="100" />
+    <button
+      follows="left|bottom"
+      height="23"
+      label="Cancel"
+      name="cancel_btn"
+      width="100"
+      left_pad="3" />
+    <button
+      follows="left|bottom"
+      height="23"
+      label="View Profile"
+      name="profile_btn"
+      width="100"
+      left_pad="3" />
   </panel>
 </panel>
-- 
cgit v1.2.3


From f1fd98b6ed73d6ef7243870b8efd7fc848fa5be7 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Thu, 1 May 2014 00:51:28 +0100
Subject: Changed layout of exp perms buttons for ACME-1468

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5e966395dc..ee007197d7 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7117,6 +7117,14 @@ Scripts associated with this experience will be able to do the following on regi
 [QUESTIONS]Is this OK?
   <tag>confirm</tag>
     <form name="form">
+      <button
+       index="3"
+       name="BlockExperience"
+       text="Block Experience"/>
+      <button
+        index="2"
+        name="Mute"
+        text="Block Object"/>
       <button
        index="0"
        name="Yes"
@@ -7125,14 +7133,6 @@ Scripts associated with this experience will be able to do the following on regi
        index="1"
        name="No"
        text="No"/>
-      <button
-        index="2"
-        name="Mute"
-        text="Block Object"/>
-      <button
-       index="3"
-       name="BlockExperience"
-       text="Block Experience"/>
     </form>
   </notification>
 
-- 
cgit v1.2.3


From f45218ff32a20d1bd490fb9dc3951c4986bdd5ca Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Thu, 1 May 2014 22:57:04 +0100
Subject: Added counter of experiences in trusted/allowed/blocked lists in
 Region/Estate floater for ACME-1435

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 7985997524..ea27d142b7 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3995,6 +3995,9 @@ Try enclosing path to the editor with double quotes.
   <string name="Admin_Experiences_Tab">ADMIN</string>
   <string name="Recent_Experiences_Tab">RECENT</string>
   <string name="Owned_Experiences_Tab">OWNED</string>
+  <string name="RegionInfoAllowedExperiences">Allowed Experiences: ([EXPERIENCES], max [MAXEXPERIENCES])</string>
+  <string name="RegionInfoBlockedExperiences">Blocked Experiences: ([EXPERIENCES], max [MAXEXPERIENCES])</string>
+  <string name="RegionInfoTrustedExperiences">Trusted Experiences: ([EXPERIENCES], max [MAXEXPERIENCES])</string>
   <string name="ExperiencePermission1">take over your controls</string>
   <string name="ExperiencePermission3">trigger animations on your avatar</string>
   <string name="ExperiencePermission4">attach to your avatar</string>
-- 
cgit v1.2.3


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/default/xui/en')

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


From 6e5452829ad452bacef92f1bdfed9d27a8d8fa98 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 6 May 2014 19:40:40 +0100
Subject: Added top caption for ACME-1434

---
 .../default/xui/en/panel_region_experiences.xml    | 28 +++++++++++++++-------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

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 f586b7b5d9..b0ef3284f1 100644
--- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
@@ -23,13 +23,25 @@
     Trusted Experiences
   </panel.string>
 
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="32"
+   layout="topleft"
+   left="10"
+   name="experiences_help_text"
+   top="14"
+   word_wrap="true">
+    Changes to settings on this tab will affect all regions in the estate.
+  </text>
   <layout_stack
     left="5"
     layout="topleft"
     follows="all"
-    top="0"
+    top="40"
     right="-5"
-    height="320"
+    height="280"
     min_height="140"
     orientation="vertical">
     <layout_panel
@@ -43,9 +55,9 @@
              filename="panel_experience_list_editor.xml" />
       <text
         layout="topleft"
-        name="text_help"
+        name="trusted_text_help"
         length="1"
-        top="20"
+        top="5"
         left_pad="5"
         width="200"
         height="200"
@@ -69,9 +81,9 @@ Any Experience may be Trusted.
         filename="panel_experience_list_editor.xml"/>
       <text
         layout="topleft"
-        name="text_help"
+        name="allowed_text_help"
         length="1"
-        top="20"
+        top="5"
         left_pad="5"
         width="200"
         height="200"
@@ -93,9 +105,9 @@ Only Experiences that are not Grid-Wide may be Allowed.
         filename="panel_experience_list_editor.xml"/>
       <text
         layout="topleft"
-        name="text_help"
+        name="blocked_text_help"
         length="1"
-        top="20"
+        top="5"
         left_pad="5"
         width="200"
         height="200"
-- 
cgit v1.2.3


From ae856ef31830912cec0f4de37167858a24e4ba30 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 6 May 2014 22:53:40 +0100
Subject: Made experience permissions notifications unique based on
 experienceid only for ACME-1471

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ee007197d7..778a9b432c 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7115,6 +7115,10 @@ Once permission is granted you will not see this message again for this experien
 Scripts associated with this experience will be able to do the following on regions where the experience is active: 
 
 [QUESTIONS]Is this OK?
+
+  <unique combine="replace_with_new">
+    <context>experience</context>
+  </unique>
   <tag>confirm</tag>
     <form name="form">
       <button
-- 
cgit v1.2.3


From d331db79c2a1f07f9919703677b44d4664c36509 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Wed, 7 May 2014 16:48:45 -0700
Subject: Build>Scripts>Recompile Scripts now will skip Experience scripts that
 the agent  can not contribute to and will keep Experience association
 otherwise.

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index a45aaa2e99..ef6877b5fa 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2464,7 +2464,8 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
 	<string name="CompileQueueProblemDownloading">Problem downloading</string>
 	<string name="CompileQueueInsufficientPermDownload">Insufficient permissions to download a script.</string>
 	<string name="CompileQueueInsufficientPermFor">Insufficient permissions for</string>
-	<string name="CompileQueueUnknownFailure">Unknown failure to download</string>
+   <string name="CompileQueueUnknownFailure">Unknown failure to download</string>
+   <string name="CompileNoExperiencePerm">Skipping script [SCRIPT] with Experience [EXPERIENCE].</string>
 	<string name="CompileQueueTitle">Recompilation Progress</string>
 	<string name="CompileQueueStart">recompile</string>
 	<string name="ResetQueueTitle">Reset Progress</string>
-- 
cgit v1.2.3


From bb5e0f7877d06f10cd9ba82bc596a072427306b2 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Fri, 9 May 2014 10:26:06 -0700
Subject: Enable the experience purchase button based on the sim providing
 purchase info.

---
 indra/newview/skins/default/xui/en/floater_experiences.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experiences.xml b/indra/newview/skins/default/xui/en/floater_experiences.xml
index e727512b7f..fe959ea6d8 100644
--- a/indra/newview/skins/default/xui/en/floater_experiences.xml
+++ b/indra/newview/skins/default/xui/en/floater_experiences.xml
@@ -4,9 +4,9 @@
   can_close="true"
   can_resize="true"
   height="400"
-  width="300"
+  width="500"
   min_height="300"
-  min_width="300"
+  min_width="500"
   layout="topleft"
   name="floater_experiences"
   save_rect="true"
@@ -18,7 +18,7 @@
     top="3"
     left="3"
     layout="topleft"
-    width="294"
+    right="-3"
     follows="all"
     height="394"
     name="xp_tabs">
-- 
cgit v1.2.3


From 169bf48f1068b0996f38ef03a9a97cd6c0fa07e0 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Tue, 13 May 2014 16:25:52 -0700
Subject: ACME-1450: Added paging to the experience picker and upped the search
 size to  30 results per page.

---
 .../default/xui/en/panel_experience_search.xml     | 35 ++++++++++++++++------
 1 file changed, 26 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_experience_search.xml b/indra/newview/skins/default/xui/en/panel_experience_search.xml
index 5ac7f6b239..3deca265da 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_search.xml
@@ -147,20 +147,37 @@
       name="ok_btn"
       top_pad="3"
       left="0"
-      width="100" />
+      width="95" />
     <button
       follows="left|bottom"
       height="23"
       label="Cancel"
       name="cancel_btn"
-      width="100"
-      left_pad="3" />
-    <button
-      follows="left|bottom"
-      height="23"
-      label="View Profile"
-      name="profile_btn"
-      width="100"
+      width="95"
       left_pad="3" />
+     <button
+        follows="left|bottom"
+        height="23"
+        label="View Profile"
+        name="profile_btn"
+        width="95"
+        left_pad="3" />
+     <button
+        follows="left|bottom"
+        height="23"
+        label="&lt;"
+        name="left_btn"
+        width="23"
+        left_pad="3"
+        enabled="false"/>
+     <button
+        follows="left|bottom"
+        height="23"
+        label="&gt;"
+        name="right_btn"
+        width="23"
+        left_pad="3"
+        enabled="false" />
+     
   </panel>
 </panel>
-- 
cgit v1.2.3


From 4c7b0cb528f61bc20866c2f7c43049ef7bc49bf2 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Fri, 16 May 2014 15:52:39 -0700
Subject: ACME-1459: Experience tab added to the about land tab for editing
 parcel Experiences

---
 .../skins/default/xui/en/floater_about_land.xml    |  19 +++-
 .../xui/en/panel_experience_list_editor.xml        |  40 ++++++--
 .../default/xui/en/panel_region_experiences.xml    | 104 ++++++++++++---------
 .../newview/skins/default/xui/en/role_actions.xml  |   6 +-
 indra/newview/skins/default/xui/en/strings.xml     |   4 +-
 5 files changed, 108 insertions(+), 65 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index a660e812cc..68f981f34f 100755
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -8,7 +8,7 @@
  help_topic="floaterland"
  save_rect="true"
  title="ABOUT LAND"
- width="490">
+ width="590">
     <floater.string
       name="maturity_icon_general">
       "Parcel_PG_Dark"
@@ -47,7 +47,7 @@
      tab_height="25"
      tab_min_width="67"
      top="10"
-     width="489">
+     width="589">
         <panel
          border="false"
          follows="all"
@@ -569,8 +569,7 @@
          left="0"
          top="0"
          help_topic="land_covenant_tab"
-         name="land_covenant_panel"
-         word_wrap="true">
+         name="land_covenant_panel">
             <panel.string
              name="can_resell"
              word_wrap="true">
@@ -2096,5 +2095,17 @@ Only large parcels can be listed in search.
              width="100" />
              </panel>
         </panel>
+       <panel
+          border="true"
+          follows="all"
+          label="EXPERIENCES"
+          layout="topleft"
+          left="0"
+          top="0"
+          help_topic="land_experiences_tab"
+          name="land_experiences_panel"
+            class="land_experiences_panel"
+          filename="panel_region_experiences.xml">
+       </panel>
     </tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml
index acd9471916..128c721992 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml
@@ -13,26 +13,46 @@
     name="loading">
     loading...
   </panel.string>
+   <panel.string
+      name="panel_allowed">
+      Allowed Experiences:
+   </panel.string>
+   <panel.string
+      name="panel_blocked">
+      Blocked Experiences:
+   </panel.string>
+   <panel.string
+      name="panel_trusted">
+      Trusted Experiences:
+   </panel.string>
   <panel.string
     name="no_results">
     (empty)
   </panel.string>
-  <text
-    layout="topleft"
-    name="text_name"
-    left="3"
-    right="-1"
-    height="12"
-    follows="left|top|right">
-    Experience List
-  </text>
+   <text
+      layout="topleft"
+      name="text_name"
+      left="3"
+      right="120"
+      height="12"
+      follows="left|top">
+      Experience List
+   </text>
+   <text
+      layout="topleft"
+      name="text_count"
+      left="125"
+      top_pad="-12"
+      right="-1"
+      height="12"
+      follows="top|left">
+   </text>
   <scroll_list
     draw_heading="false"
     left="3"
     width="225"
     height="77"
     follows="all"
-    can_resize="false"
     name="experience_list">
     <columns
       width="225"
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 b0ef3284f1..ea57bdd164 100644
--- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
@@ -10,44 +10,67 @@
   left="0"
   top="320"
   width="480">
-  <panel.string
-    name="panel_allowed">
-    Allowed Experiences
-  </panel.string>
-  <panel.string
-    name="panel_blocked">
-    Blocked Experiences
-  </panel.string>
-  <panel.string
-    name="panel_trusted">
-    Trusted Experiences
-  </panel.string>
+   <panel.string
+      name="trusted_estate_text">
+Any Experience may be Trusted.
+
+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.
+   </panel.string>
+   <panel.string
+      name="allowed_estate_text">
+Only Experiences that are not Grid-Wide may be Allowed.
 
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="32"
-   layout="topleft"
-   left="10"
-   name="experiences_help_text"
-   top="14"
-   word_wrap="true">
-    Changes to settings on this tab will affect all regions in the estate.
-  </text>
+Allowed Experiences have permission to run on this estate.
+   </panel.string>
+   <panel.string
+      name="blocked_estate_text">
+Only Grid-Wide Experiences may be Blocked.
+      
+Blocked Experiences may not run on this estate.
+   </panel.string>
+   <panel.string 
+      name="estate_caption">
+      Changes to settings on this tab will affect all regions in the estate.
+   </panel.string>
+   <panel.string
+      name="allowed_parcel_text">Only Experiences that are not Grid-Wide may be Allowed.
+      
+Allowed Experiences have permission to run on this parcel if they are not Blocked by the estate.
+   </panel.string>
+   <panel.string
+      name="blocked_parcel_text">Only Grid-Wide Experiences may be Blocked.
+      
+Blocked Experiences may not run on this parcel.
+   </panel.string>
+   <panel.string
+      name="parcel_caption">
+   </panel.string>
+   <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="32"
+      layout="topleft"
+      left="10"
+      name="experiences_help_text"
+      top="14"
+      word_wrap="true"/>
   <layout_stack
     left="5"
     layout="topleft"
     follows="all"
-    top="40"
     right="-5"
-    height="280"
-    min_height="140"
+    height="260"
     orientation="vertical">
     <layout_panel
-      height="100"
-      min_height="100"
-      width="530">
+       follows="all"
+      height="50"
+      min_height="50"
+      width="530"
+      visible="false"
+      name="trusted_layout_panel">
       <panel follows="all"
              width="330"
              name="panel_trusted"
@@ -63,16 +86,12 @@
         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"
+      height="50"
+       min_height="50"
+       follows="all"
       width="530">
       <panel
         width="330"
@@ -89,14 +108,12 @@ Any Experience may be Trusted.
         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"
+      height="50"
+       min_height="50"
+       follows="all"
       width="530">
       <panel
         width="330"
@@ -113,9 +130,6 @@ Only Experiences that are not Grid-Wide may be Allowed.
         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>
diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml
index 9e429234d3..df38a7c9c8 100755
--- a/indra/newview/skins/default/xui/en/role_actions.xml
+++ b/indra/newview/skins/default/xui/en/role_actions.xml
@@ -194,9 +194,9 @@
             longdescription="Members in a role with this ability can edit the meta-data for an experience."
             name="experience admin"
             value ="49" />
-    <action description="Experience Creator"
-            longdescription="Members in a role with this ability can create scripts for an experience."
-            name="experience creator"
+    <action description="Experience Contributor"
+            longdescription="Members in a role with this ability can contribute scripts for an experience."
+            name="experience contributor"
             value ="50" />
   </action_set>
 </role_actions>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ef6877b5fa..72b41f922e 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3997,9 +3997,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Admin_Experiences_Tab">ADMIN</string>
   <string name="Recent_Experiences_Tab">RECENT</string>
   <string name="Owned_Experiences_Tab">OWNED</string>
-  <string name="RegionInfoAllowedExperiences">Allowed Experiences: ([EXPERIENCES], max [MAXEXPERIENCES])</string>
-  <string name="RegionInfoBlockedExperiences">Blocked Experiences: ([EXPERIENCES], max [MAXEXPERIENCES])</string>
-  <string name="RegionInfoTrustedExperiences">Trusted Experiences: ([EXPERIENCES], max [MAXEXPERIENCES])</string>
+  <string name="ExperiencesCounter">([EXPERIENCES], max [MAXEXPERIENCES])</string>
   <string name="ExperiencePermission1">take over your controls</string>
   <string name="ExperiencePermission3">trigger animations on your avatar</string>
   <string name="ExperiencePermission4">attach to your avatar</string>
-- 
cgit v1.2.3


From 43d12faffebe327b32724abbb5612e0351a18976 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Sat, 17 May 2014 04:21:56 +0100
Subject: Added COMBINE_WITH_NEW for notifications for ACME-1471

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 778a9b432c..ac78ae6a3e 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7116,7 +7116,7 @@ Scripts associated with this experience will be able to do the following on regi
 
 [QUESTIONS]Is this OK?
 
-  <unique combine="replace_with_new">
+  <unique combine="combine_with_new">
     <context>experience</context>
   </unique>
   <tag>confirm</tag>
-- 
cgit v1.2.3


From 8924b2807585231fa40757ee4b76a0adbb2e3009 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Fri, 30 May 2014 03:49:22 +0100
Subject: Added a popup for choosing this or all estates when adding/removing
 an experience in the Region/Estate floater for ACME-1436

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 2e804c2404..b207051ec8 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4358,6 +4358,90 @@ Remove estate manager for this estate only or for [ALL_ESTATES]?
      yestext="This Estate"/>
   </notification>
 
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateAllowedExperienceAdd"
+   type="alert">
+    Add to allowed list for this estate only or for [ALL_ESTATES]?
+    <tag>confirm</tag>
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateAllowedExperienceRemove"
+   type="alert">
+    Remove from allowed list for this estate only or for [ALL_ESTATES]?
+    <tag>confirm</tag>
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateBlockedExperienceAdd"
+   type="alert">
+    Add to blocked list for this estate only or for [ALL_ESTATES]?
+    <tag>confirm</tag>
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateBlockedExperienceRemove"
+   type="alert">
+    Remove from blocked list for this estate only or for [ALL_ESTATES]?
+    <tag>confirm</tag>
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateTrustedExperienceAdd"
+   type="alert">
+    Add to trusted list for this estate only or for [ALL_ESTATES]?
+    <tag>confirm</tag>
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateTrustedExperienceRemove"
+   type="alert">
+    Remove from trusted list for this estate only or for [ALL_ESTATES]?
+    <tag>confirm</tag>
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>  
+
   <notification
    icon="alert.tga"
    label="Confirm Kick"
-- 
cgit v1.2.3


From 8c44f87c7cbf8ebcc884e9566484ede13bc24af1 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Fri, 30 May 2014 10:19:22 -0700
Subject: ACME-1498: Removed invalid attribute

---
 indra/newview/skins/default/xui/en/panel_experience_search.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_experience_search.xml b/indra/newview/skins/default/xui/en/panel_experience_search.xml
index 3deca265da..99ad3e7fe3 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_search.xml
@@ -122,7 +122,6 @@
       top_pad="4"
       follows="all" 
       column_padding="5"
-      can_resize="true"
       name="search_results">
       <columns
         halign="center"
-- 
cgit v1.2.3


From f10f3d2fdec90b0ca4d34e6b90642e7c45896d9e Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Mon, 2 Jun 2014 21:16:28 +0100
Subject: Added URL menu for experience profile links for ACME-1469

---
 indra/newview/skins/default/xui/en/menu_url_experience.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/menu_url_experience.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/menu_url_experience.xml b/indra/newview/skins/default/xui/en/menu_url_experience.xml
new file mode 100644
index 0000000000..f4d50e1603
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_url_experience.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Url Popup">
+    <menu_item_call
+     label="Copy SLurl to clipboard"
+     layout="topleft"
+     name="url_copy">
+        <menu_item_call.on_click
+         function="Url.CopyUrl" />
+    </menu_item_call>
+</context_menu>
-- 
cgit v1.2.3


From 921a93999bf78dcff9da3fa6cd7e1ec01d998d02 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Thu, 5 Jun 2014 03:11:01 +0100
Subject: Fixed double vision in experience picker floater for ACME-1473

---
 indra/newview/skins/default/xui/en/floater_experience_search.xml | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experience_search.xml b/indra/newview/skins/default/xui/en/floater_experience_search.xml
index 7d7e3ba95a..15a4b5665e 100644
--- a/indra/newview/skins/default/xui/en/floater_experience_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_experience_search.xml
@@ -11,10 +11,4 @@
   help_topic="experiencepicker"
   title="CHOOSE EXPERIENCE"
   width="350">
-
-  <panel
-    filename="panel_experience_search.xml"
-    class="llpanelexperiencepicker"
-    follows="all"
-    name="panel_experience_search"/>
 </floater>
-- 
cgit v1.2.3


From 53a39f360979ee7615d4c4bc069754d8b71bb600 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 11 Jun 2014 01:58:47 +0100
Subject: Added question mark help button to the experiences floater for
 ACME-1506

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experiences.xml b/indra/newview/skins/default/xui/en/floater_experiences.xml
index fe959ea6d8..70e7507907 100644
--- a/indra/newview/skins/default/xui/en/floater_experiences.xml
+++ b/indra/newview/skins/default/xui/en/floater_experiences.xml
@@ -8,6 +8,7 @@
   min_height="300"
   min_width="500"
   layout="topleft"
+  help_topic="floater_experiences"
   name="floater_experiences"
   save_rect="true"
   single_instance="true"
-- 
cgit v1.2.3


From d04d37e200466fd50cd7d0e9a32b2f60df924960 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 11 Jun 2014 23:25:18 +0100
Subject: Added help topic to experience profile floater for ACME-1506

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index c6a749b45f..165de9592e 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -5,6 +5,7 @@
   can_close="true"
   enabled="true"
   can_resize="true"
+  help_topic="floater_experienceprofile"
   title="EXPERIENCE PROFILE"
   save_rect="true"
   min_width="325"
-- 
cgit v1.2.3


From 7019c39a97ffc10090d52a8545521e78d6583a0a Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 11 Jun 2014 23:33:19 +0100
Subject: Moved buttons to very bottom of edit experience profile floater for
 ACME-1503

---
 .../default/xui/en/floater_experienceprofile.xml   | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index 165de9592e..d146d1306f 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -649,6 +649,17 @@
                      follows="top|left|right"
                      label="Hide In Search"
                      name="edit_private_btn"/>
+          <text
+            follows="left|top|right"
+            height="25"
+            layout="topleft"
+            left="10"
+            top_pad="10"
+            name="changes"
+            use_ellipses="true"
+            word_wrap="true"
+            value="Experience changes may take several minutes to be seen on all regions."
+            right="-10"/>
           <button
             follows="top|left"
             height="23"
@@ -669,17 +680,6 @@
             width="125"
             right="-10"
             visible="true"/>
-          <text
-            follows="left|top|right"
-            height="25"
-            layout="topleft"
-            left="10"
-            top_pad="10"
-            name="changes"
-            use_ellipses="true"
-            word_wrap="true"
-            value="Experience changes may take several minutes to be seen on all regions."
-            right="-10"/>
         </panel>
       </scroll_container>
     </panel>
-- 
cgit v1.2.3


From 24d825e72977fe5e80e3497cc57cd172418bd306 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Fri, 13 Jun 2014 14:22:32 -0700
Subject: ACME-1527: Reverted about land floater size

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 68f981f34f..62ab8ed193 100755
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -8,7 +8,7 @@
  help_topic="floaterland"
  save_rect="true"
  title="ABOUT LAND"
- width="590">
+ width="490">
     <floater.string
       name="maturity_icon_general">
       "Parcel_PG_Dark"
@@ -47,7 +47,7 @@
      tab_height="25"
      tab_min_width="67"
      top="10"
-     width="589">
+     width="489">
         <panel
          border="false"
          follows="all"
@@ -569,7 +569,8 @@
          left="0"
          top="0"
          help_topic="land_covenant_tab"
-         name="land_covenant_panel">
+         name="land_covenant_panel"
+         word_wrap="true">
             <panel.string
              name="can_resell"
              word_wrap="true">
-- 
cgit v1.2.3


From 90262889c6f559492a6f245cc389594f868a93ae Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Thu, 19 Jun 2014 01:53:27 +0100
Subject: Added list of experiences to group profile floater for ACME-1525

---
 .../skins/default/xui/en/panel_group_info_sidetray.xml   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index b3326d8da6..95312edfb9 100755
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -176,6 +176,22 @@ background_visible="true"
                      name="group_land_tab_panel"
                      top="0" />
          </accordion_tab>
+         <accordion_tab
+             expanded="false"
+             layout="topleft"
+             name="group_experiences_tab"
+             title="Experiences"
+             fit_panel="false">
+           <panel
+               border="false"
+               class="panel_group_experiences"
+               filename="panel_experiences.xml"
+               follows="left|top|right"
+               layout="topleft"
+               left="0"
+               name="group_experiences_tab_panel"
+               top="0" />
+         </accordion_tab>
          </accordion>
    </layout_panel>
   </layout_stack>
-- 
cgit v1.2.3


From f804bcadb18488d36a97dc1f3a9ca2e4b1f7f039 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 2 Jul 2014 01:05:52 +0100
Subject: Added 'Loading experiences...' message on experience lists before
 populating lists  for ACME-1543

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_experiences.xml b/indra/newview/skins/default/xui/en/panel_experiences.xml
index 82b69fc344..7691e684c0 100644
--- a/indra/newview/skins/default/xui/en/panel_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_experiences.xml
@@ -9,6 +9,9 @@
   label="Experiences"
   bg_opaque_color="0 0.5 0 0.3"
   follows="all">
+  <string
+    name="loading_experiences"
+    value="Loading experiences..."/>
   <string
     name="no_experiences"
     value="No experiences."/>
-- 
cgit v1.2.3


From 5f09e6709877d2782a1a96264c545ace7f22519b Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 20 Aug 2014 00:20:06 +0100
Subject: Made expandable_text take max_length as a parameter and set
 experience profile description max_length to 2048 for ACME-1583

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index d146d1306f..a8e462ecb4 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -182,7 +182,8 @@
                 name="experience_description"
                 top="0"
                 value=""
-                width="293"/>
+                width="293"
+                max_length="2048"/>
             </layout_panel>
             <layout_panel
               follows=""
-- 
cgit v1.2.3


From 5b82645ba2db049589cdc2f22c8c63794b949772 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 20 Aug 2014 00:33:23 +0100
Subject: Added tooltip to > button in script editor for ACME-1588

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
index 40b47dc1d7..e8826034f6 100755
--- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
@@ -37,6 +37,10 @@
     name="add_experiences">
     Select to add an experience
   </floater.string>
+  <floater.string
+    name="show_experience_profile">
+    Click to view the experience profile
+  </floater.string>
   <floater.string
     name="loading">
     Loading...
-- 
cgit v1.2.3


From 55ed31173798a7d5a3b7cb42c6d6d552820c5e14 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 20 Aug 2014 00:46:49 +0100
Subject: Reverted change to expandable_text, to use pre-existing functionality
 to fix ACME-1583

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index a8e462ecb4..2dfba1ac44 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -183,7 +183,7 @@
                 top="0"
                 value=""
                 width="293"
-                max_length="2048"/>
+                textbox.max_length="2048"/>
             </layout_panel>
             <layout_panel
               follows=""
-- 
cgit v1.2.3


From 89eac2548a9b66d8bab27a7e8d7d1ed2159e9515 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 20 Aug 2014 01:11:27 +0100
Subject: Made it possible to search for experiences with an empty search
 string, and show experiences with blank names as (untitled experience) for
 ACME-1585

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 72cebb1060..1bf1ee930c 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4028,6 +4028,7 @@ Try enclosing path to the editor with double quotes.
   <!-- Experience Tools strings -->
   <string name="experience_tools_experience">Experience</string>
   <string name="ExperienceNameNull">(no experience)</string>
+  <string name="ExperienceNameUntitled">(untitled experience)</string>
   <string name="GRID_WIDE">Grid-wide</string>
   <string name="Allowed_Experiences_Tab">ALLOWED</string>
   <string name="Blocked_Experiences_Tab">BLOCKED</string>
-- 
cgit v1.2.3


From 8cc8e7dc77c7aff6d4698632d6a3bebe76698ff7 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Tue, 28 Oct 2014 11:43:45 -0700
Subject: ACME-1601: Updated message to match behavior ACME-1616: Change
 references of "Grid-Wide" to "Grid-Scope" and "non Grid-Wide"  to
 "Land-Scope"

---
 indra/newview/skins/default/xui/en/notifications.xml            | 2 +-
 indra/newview/skins/default/xui/en/panel_region_experiences.xml | 8 ++++----
 indra/newview/skins/default/xui/en/strings.xml                  | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8f208b979f..8960fad02b 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7326,7 +7326,7 @@ You do not have access to this destination. You may be allowed into the region b
    name="ScriptQuestionExperience"
    persist="false"
    type="notify">
-&apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, an object owned by &apos;[NAME]&apos;, requests your participation in the [GRID_WIDE]experience:
+&apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, an object owned by &apos;[NAME]&apos;, requests your participation in the [GRID_WIDE] experience:
 
 [EXPERIENCE]
 
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 ea57bdd164..9d06ce6b0c 100644
--- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
@@ -20,13 +20,13 @@ Additionally, if the estate does not allow public access, Residents participatin
    </panel.string>
    <panel.string
       name="allowed_estate_text">
-Only Experiences that are not Grid-Wide may be Allowed.
+Only Experiences that are Land-Scope may be Allowed.
 
 Allowed Experiences have permission to run on this estate.
    </panel.string>
    <panel.string
       name="blocked_estate_text">
-Only Grid-Wide Experiences may be Blocked.
+Only Grid-Scope Experiences may be Blocked.
       
 Blocked Experiences may not run on this estate.
    </panel.string>
@@ -35,12 +35,12 @@ Blocked Experiences may not run on this estate.
       Changes to settings on this tab will affect all regions in the estate.
    </panel.string>
    <panel.string
-      name="allowed_parcel_text">Only Experiences that are not Grid-Wide may be Allowed.
+      name="allowed_parcel_text">Only Experiences that are Land-Scope may be Allowed.
       
 Allowed Experiences have permission to run on this parcel if they are not Blocked by the estate.
    </panel.string>
    <panel.string
-      name="blocked_parcel_text">Only Grid-Wide Experiences may be Blocked.
+      name="blocked_parcel_text">Any Resident Experience may be Blocked.
       
 Blocked Experiences may not run on this parcel.
    </panel.string>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index fbf696933b..65c95e9486 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4031,7 +4031,8 @@ Try enclosing path to the editor with double quotes.
   <string name="experience_tools_experience">Experience</string>
   <string name="ExperienceNameNull">(no experience)</string>
   <string name="ExperienceNameUntitled">(untitled experience)</string>
-  <string name="GRID_WIDE">Grid-wide</string>
+  <string name="Land-Scope">Land-Scope</string>
+  <string name="Grid-Scope">Grid-Scope</string>
   <string name="Allowed_Experiences_Tab">ALLOWED</string>
   <string name="Blocked_Experiences_Tab">BLOCKED</string>
   <string name="Contrib_Experiences_Tab">CONTRIBUTOR</string>
-- 
cgit v1.2.3


From c2a516aee1f8c1e26124a77f62962944137ef960 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Thu, 6 Nov 2014 16:25:17 -0800
Subject: ACME-1635: Trusted Experiences now referred to as Key Experiences.

---
 indra/newview/skins/default/xui/en/notifications.xml                | 2 ++
 indra/newview/skins/default/xui/en/panel_experience_list_editor.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_region_experiences.xml     | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8960fad02b..fa5c1cda4a 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7298,6 +7298,8 @@ Unable to acquire a new experience:
 You do not have access to this destination. You may be allowed into the region by Accepting an experience below:
 
 [EXPERIENCE_LIST]
+
+Other Key Experiences may be available.
   </notification>
     
 
diff --git a/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml
index 128c721992..e6b88ae534 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml
@@ -23,7 +23,7 @@
    </panel.string>
    <panel.string
       name="panel_trusted">
-      Trusted Experiences:
+      Key Experiences:
    </panel.string>
   <panel.string
     name="no_results">
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 9d06ce6b0c..d909731809 100644
--- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
@@ -12,11 +12,11 @@
   width="480">
    <panel.string
       name="trusted_estate_text">
-Any Experience may be Trusted.
+Any Experience may be Key.
 
-Trusted Experiences have permission to run on this estate.
+Key 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.
+Additionally, if the estate does not allow public access, Residents participating in any Key Experience may enter the estate and can remain as long as they are in a Key Experience.
    </panel.string>
    <panel.string
       name="allowed_estate_text">
-- 
cgit v1.2.3


From dbbf9ccd32f8655e3873bee0db14be7ec91f619d Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Fri, 7 Nov 2014 18:22:27 +0200
Subject: ACME-1598 FIXED Problems with scroll bar in experiences tab

---
 indra/newview/skins/default/xui/en/panel_region_experiences.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

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 d909731809..d49fb613a4 100644
--- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
@@ -89,7 +89,7 @@ Blocked Experiences may not run on this parcel.
       </text>
     </layout_panel>
     <layout_panel
-      height="50"
+      height="110"
        min_height="50"
        follows="all"
       width="530">
@@ -111,7 +111,7 @@ Blocked Experiences may not run on this parcel.
       </text>
     </layout_panel>
     <layout_panel
-      height="50"
+      height="110"
        min_height="50"
        follows="all"
       width="530">
-- 
cgit v1.2.3


From 48981156c888a755f6a370552018d4d7d564560e Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 20 Nov 2014 12:04:56 +0200
Subject: ACME-1637 FIXED Key Experiences field too short in Estate Experiences
 floater

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

(limited to 'indra/newview/skins/default/xui/en')

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 d49fb613a4..9581f53ed8 100644
--- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
@@ -66,7 +66,7 @@ Blocked Experiences may not run on this parcel.
     orientation="vertical">
     <layout_panel
        follows="all"
-      height="50"
+      height="110"
       min_height="50"
       width="530"
       visible="false"
-- 
cgit v1.2.3


From d10013a59067a0409ed9751b7405c9e32db1ee60 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Fri, 21 Nov 2014 13:46:37 +0200
Subject: ACME-1637 FIXED Updated panels height

---
 indra/newview/skins/default/xui/en/panel_experience_list_editor.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_region_experiences.xml     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml
index e6b88ae534..c76b958eda 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml
@@ -51,7 +51,7 @@
     draw_heading="false"
     left="3"
     width="225"
-    height="77"
+    height="75"
     follows="all"
     name="experience_list">
     <columns
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 9581f53ed8..bced46f7dc 100644
--- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
@@ -66,7 +66,7 @@ Blocked Experiences may not run on this parcel.
     orientation="vertical">
     <layout_panel
        follows="all"
-      height="110"
+      height="93"
       min_height="50"
       width="530"
       visible="false"
@@ -89,7 +89,7 @@ Blocked Experiences may not run on this parcel.
       </text>
     </layout_panel>
     <layout_panel
-      height="110"
+      height="93"
        min_height="50"
        follows="all"
       width="530">
@@ -111,7 +111,7 @@ Blocked Experiences may not run on this parcel.
       </text>
     </layout_panel>
     <layout_panel
-      height="110"
+      height="93"
        min_height="50"
        follows="all"
       width="530">
-- 
cgit v1.2.3


From f25c3b32ddfb13e34e54ac94b28c1251ed1d7a3d Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Fri, 21 Nov 2014 19:36:18 +0200
Subject: ACME-1639 FIXED A few references to "Trusted Experiences" need to be
 changed to Key experiences

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index fa5c1cda4a..61385e9805 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4509,7 +4509,7 @@ Remove estate manager for this estate only or for [ALL_ESTATES]?
    label="Select estate"
    name="EstateTrustedExperienceAdd"
    type="alert">
-    Add to trusted list for this estate only or for [ALL_ESTATES]?
+    Add to key list for this estate only or for [ALL_ESTATES]?
     <tag>confirm</tag>
     <usetemplate
      canceltext="Cancel"
@@ -4523,7 +4523,7 @@ Remove estate manager for this estate only or for [ALL_ESTATES]?
    label="Select estate"
    name="EstateTrustedExperienceRemove"
    type="alert">
-    Remove from trusted list for this estate only or for [ALL_ESTATES]?
+    Remove from key list for this estate only or for [ALL_ESTATES]?
     <tag>confirm</tag>
     <usetemplate
      canceltext="Cancel"
@@ -7283,7 +7283,7 @@ Unable to acquire a new experience:
     name="TrustedExperienceEntry"
     persist="false"
     type="notify">
-    You have been allowed into the region [region_name] by participating in the trusted experience secondlife:///app/experience/[public_id]/profile removing this experience may kick you from the region.
+    You have been allowed into the region [region_name] by participating in the key experience secondlife:///app/experience/[public_id]/profile removing this experience may kick you from the region.
     <form name="form">
       <ignore name="ignore"
               text="Allowed into a region by an experience"/>
-- 
cgit v1.2.3


From e21f8284fdd9cd86e2822b233775e9a3d77917d5 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Fri, 21 Nov 2014 19:36:18 +0200
Subject: ACME-1639 FIXED A few references to "Trusted Experiences" need to be
 changed to Key experiences

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index fa5c1cda4a..61385e9805 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4509,7 +4509,7 @@ Remove estate manager for this estate only or for [ALL_ESTATES]?
    label="Select estate"
    name="EstateTrustedExperienceAdd"
    type="alert">
-    Add to trusted list for this estate only or for [ALL_ESTATES]?
+    Add to key list for this estate only or for [ALL_ESTATES]?
     <tag>confirm</tag>
     <usetemplate
      canceltext="Cancel"
@@ -4523,7 +4523,7 @@ Remove estate manager for this estate only or for [ALL_ESTATES]?
    label="Select estate"
    name="EstateTrustedExperienceRemove"
    type="alert">
-    Remove from trusted list for this estate only or for [ALL_ESTATES]?
+    Remove from key list for this estate only or for [ALL_ESTATES]?
     <tag>confirm</tag>
     <usetemplate
      canceltext="Cancel"
@@ -7283,7 +7283,7 @@ Unable to acquire a new experience:
     name="TrustedExperienceEntry"
     persist="false"
     type="notify">
-    You have been allowed into the region [region_name] by participating in the trusted experience secondlife:///app/experience/[public_id]/profile removing this experience may kick you from the region.
+    You have been allowed into the region [region_name] by participating in the key experience secondlife:///app/experience/[public_id]/profile removing this experience may kick you from the region.
     <form name="form">
       <ignore name="ignore"
               text="Allowed into a region by an experience"/>
-- 
cgit v1.2.3