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