Removed unused files

3 files changed, 138 insertions, 117 deletions

diff --git a/indra/newview/llfloaterscriptexperience.cpp b/indra/newview/llfloaterscriptexperience.cpp
deleted file mode 100644
index 497522e821..0000000000
--- a/indra/newview/llfloaterscriptexperience.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloaterscriptexperience.h"
-
-LLFloaterScriptExperience::LLFloaterScriptExperience(const LLSD& data)
-	:LLFloater(data)
-{
-}
-
-BOOL LLFloaterScriptExperience::postBuild()
-{
-	return TRUE;
-}
diff --git a/indra/newview/llfloaterscriptexperience.h b/indra/newview/llfloaterscriptexperience.h
deleted file mode 100644
index c79ff78131..0000000000
--- a/indra/newview/llfloaterscriptexperience.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/** 
- * @file llfloaterscriptexperience.h
- * @brief LLFloaterScriptExperience class definition
- *
- * $LicenseInfo:firstyear=2012&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2012, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLFLOATERSCRIPTEXPERIENCE_H
-#define LL_LLFLOATERSCRIPTEXPERIENCE_H
-
-#include "llfloater.h"
-
-class LLFloaterScriptExperience :
-	public LLFloater
-{
-public:
-	LLFloaterScriptExperience(const LLSD& data);
-
-protected:
-	/*virtual*/ BOOL	postBuild();
-
-private:
-
-};
-
-#endif //LL_LLFLOATERSCRIPTEXPERIENCE_H
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>