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')

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