19 files changed, 827 insertions, 17 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index e93d73ad0e..fc138cc12e 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -203,6 +203,7 @@ set(viewer_SOURCE_FILES
     llfloatereditwater.cpp
     llfloaterenvironmentsettings.cpp
     llfloaterevent.cpp
+    llfloaterexperiences.cpp
     llfloaterfonttest.cpp
     llfloatergesture.cpp
     llfloatergodtools.cpp
@@ -371,6 +372,7 @@ set(viewer_SOURCE_FILES
     llpanelclassified.cpp
     llpanelcontents.cpp
     llpaneleditwearable.cpp
+    llpanelexperiences.cpp
     llpanelface.cpp
     llpanelgenerictip.cpp
     llpanelgroup.cpp
@@ -779,6 +781,7 @@ set(viewer_HEADER_FILES
     llfloatereditwater.h
     llfloaterenvironmentsettings.h
     llfloaterevent.h
+    llfloaterexperiences.h
     llfloaterfonttest.h
     llfloatergesture.h
     llfloatergodtools.h
@@ -941,6 +944,7 @@ set(viewer_HEADER_FILES
     llpanelclassified.h
     llpanelcontents.h
     llpaneleditwearable.h
+    llpanelexperiences.h
     llpanelface.h
     llpanelgenerictip.h
     llpanelgroup.h
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 1000c0e1e8..262175e009 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -100,6 +100,7 @@
 // Linden library includes
 #include "llavatarnamecache.h"
 #include "lldiriterator.h"
+#include "llexperiencecache.h"
 #include "llimagej2c.h"
 #include "llmemory.h"
 #include "llprimitive.h"
@@ -4144,7 +4145,7 @@ void LLAppViewer::loadNameCache()
 }
 
 void LLAppViewer::saveNameCache()
-	{
+{
 	// display names cache
 	std::string filename =
 		gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "avatar_name_cache.xml");
@@ -4152,7 +4153,7 @@ void LLAppViewer::saveNameCache()
 	if(name_cache_stream.is_open())
 	{
 		LLAvatarNameCache::exportFile(name_cache_stream);
-}
+	}
 
 	if (!gCacheName) return;
 
@@ -4165,6 +4166,32 @@ void LLAppViewer::saveNameCache()
 	}
 }
 
+
+void LLAppViewer::saveExperienceCache()
+{
+	std::string filename =
+		gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "experience_cache.xml");
+	LL_INFOS("ExperienceCache") << "Saving " << filename << LL_ENDL;
+	llofstream cache_stream(filename);
+	if(cache_stream.is_open())
+	{
+		LLExperienceCache::exportFile(cache_stream);
+	}
+}
+
+void LLAppViewer::loadExperienceCache()
+{
+	std::string filename =
+		gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "experience_cache.xml");
+	LL_INFOS("ExperienceCache") << "Loading " << filename << LL_ENDL;
+	llifstream cache_stream(filename);
+	if(cache_stream.is_open())
+	{
+		LLExperienceCache::importFile(cache_stream);
+	}
+}
+
+
 /*!	@brief		This class is an LLFrameTimer that can be created with
 				an elapsed time that starts counting up from the given value
 				rather than 0.0.
@@ -4365,7 +4392,7 @@ void LLAppViewer::idle()
 	    // floating throughout the various object lists.
 	    //
 		idleNameCache();
-    
+		idleExperienceCache();
 		idleNetwork();
 	    	        
 
@@ -4779,6 +4806,22 @@ void LLAppViewer::idleNameCache()
 	LLAvatarNameCache::idle();
 }
 
+void LLAppViewer::idleExperienceCache()
+{
+	LLViewerRegion* region = gAgent.getRegion();
+	if (!region) return;
+	
+	std::string lookup_url=region->getCapability("GetExperienceInfo"); 
+	if(!lookup_url.empty() && lookup_url.back() != '/')
+	{
+		lookup_url += '/';
+	}
+	
+	LLExperienceCache::setLookupURL(lookup_url);
+
+	LLExperienceCache::idle();
+}
+
 //
 // Handle messages, and all message related stuff
 //
@@ -4941,6 +4984,7 @@ void LLAppViewer::disconnectViewer()
 	}
 
 	saveNameCache();
+	saveExperienceCache();
 
 	// close inventory interface, close all windows
 	LLFloaterInventory::cleanup();
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index 7563d672e3..f80fec20d7 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -117,6 +117,10 @@ public:
     void loadNameCache();
     void saveNameCache();
 
+	void loadExperienceCache();
+	void saveExperienceCache();
+
+
 	void removeMarkerFile(bool leave_logout_marker = false);
 	
     // LLAppViewer testing helpers.
@@ -221,6 +225,7 @@ private:
     void idle(); 
     void idleShutdown();
 	// update avatar SLID and display name caches
+	void idleExperienceCache();
 	void idleNameCache();
     void idleNetwork();
 
diff --git a/indra/newview/llfloaterexperiences.cpp b/indra/newview/llfloaterexperiences.cpp
new file mode 100644
index 0000000000..b862b41bba
--- /dev/null
+++ b/indra/newview/llfloaterexperiences.cpp
@@ -0,0 +1,14 @@
+#include "llviewerprecompiledheaders.h"
+
+#include "llpanelexperiences.h"
+#include "llfloaterexperiences.h"
+
+LLFloaterExperiences::LLFloaterExperiences(const LLSD& data)
+	:LLFloater(data)
+{
+}
+
+BOOL LLFloaterExperiences::postBuild()
+{
+	return TRUE;
+}
diff --git a/indra/newview/llfloaterexperiences.h b/indra/newview/llfloaterexperiences.h
new file mode 100644
index 0000000000..1e5f216f8d
--- /dev/null
+++ b/indra/newview/llfloaterexperiences.h
@@ -0,0 +1,45 @@
+/** 
+ * @file llfloaterexperiences.h
+ * @brief LLFloaterExperiences 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_LLFLOATEREXPERIENCES_H
+#define LL_LLFLOATEREXPERIENCES_H
+
+#include "llfloater.h"
+
+class LLFloaterExperiences :
+	public LLFloater
+{
+public:
+	LLFloaterExperiences(const LLSD& data);
+
+protected:
+	/*virtual*/ BOOL	postBuild();
+
+private:
+
+};
+
+#endif //LL_LLFLOATEREXPERIENCES_H
diff --git a/indra/newview/llpanelexperiences.cpp b/indra/newview/llpanelexperiences.cpp
new file mode 100644
index 0000000000..02a3c4c410
--- /dev/null
+++ b/indra/newview/llpanelexperiences.cpp
@@ -0,0 +1,302 @@
+#include "llviewerprecompiledheaders.h"
+
+
+#include "llpanelprofile.h"
+#include "lluictrlfactory.h"
+#include "llexperiencecache.h"
+#include "llagent.h"
+
+#include "llpanelexperiences.h"
+
+
+static LLRegisterPanelClassWrapper<LLPanelExperiences> register_experiences_panel("experiences_panel");
+
+
+LLPanelExperiences::LLPanelExperiences(  )
+	:	mExperiencesList(NULL),
+	mExperiencesAccTab(NULL),
+	mProfilePanel(NULL),
+	mPanelExperienceInfo(NULL),
+	mNoExperiences(false)
+{
+
+}
+
+void* LLPanelExperiences::create( void* data )
+{
+	return new LLPanelExperiences();
+}
+
+void ExperienceResult(LLHandle<LLPanelExperiences> panel, const LLSD& experience)
+{
+	LLPanelExperiences* experiencePanel = panel.get();
+	if(experiencePanel)
+	{
+		experiencePanel->addExperienceInfo(experience);
+	}
+}
+
+class LLExperienceListResponder : public LLHTTPClient::Responder
+{
+public:
+	LLExperienceListResponder(const LLHandle<LLPanelExperiences>& parent):mParent(parent)
+	{
+	}
+
+	LLHandle<LLPanelExperiences> mParent;
+
+	virtual void result(const LLSD& content)
+	{
+		if(mParent.isDead())
+			return;
+
+		LLSD experiences = content["experiences"];
+		LLSD::array_const_iterator it = experiences.beginArray();
+		for( /**/ ; it != experiences.endArray(); ++it)
+		{
+			LLUUID public_key = it->asUUID();
+
+			LLExperienceCache::get(public_key, LLExperienceCache::PUBLIC_KEY, boost::bind(ExperienceResult, mParent, _1));
+		}
+	}
+};
+
+void LLPanelExperiences::addExperienceInfo(const LLSD& experience)
+{
+	LLExperienceItem* item = new LLExperienceItem();
+	if(experience.has(LLExperienceCache::NAME))
+	{
+		item->setExperienceName(experience[LLExperienceCache::NAME].asString());
+	}
+	else if(experience.has("error"))
+	{
+		item->setExperienceName(experience["error"].asString());
+	}
+
+	if(experience.has(LLExperienceCache::PUBLIC_KEY))
+	{
+		item->setExperienceDescription(experience[LLExperienceCache::PUBLIC_KEY].asString());
+	}
+
+	mExperiencesList->addItem(item);
+
+}
+
+
+BOOL LLPanelExperiences::postBuild( void )
+{
+	mExperiencesList = getChild<LLFlatListView>("experiences_list");
+	if(hasString("no_experiences"))
+	{
+		mExperiencesList->setNoItemsCommentText(getString("no_experiences"));
+	}
+
+
+	LLViewerRegion* region = gAgent.getRegion();
+	if (region)
+	{
+		std::string lookup_url=region->getCapability("GetExperiences"); 
+		if(!lookup_url.empty())
+		{
+			LLHTTPClient::get(lookup_url, new LLExperienceListResponder(getDerivedHandle<LLPanelExperiences>()));
+		}
+	}
+
+	mExperiencesAccTab = getChild<LLAccordionCtrlTab>("tab_experiences");
+	mExperiencesAccTab->setDropDownStateChangedCallback(boost::bind(&LLPanelExperiences::onAccordionStateChanged, this, mExperiencesAccTab));
+	mExperiencesAccTab->setDisplayChildren(true);
+
+	return TRUE;
+}
+
+void LLPanelExperiences::onOpen( const LLSD& key )
+{
+	LLPanel::onOpen(key);
+}
+
+void LLPanelExperiences::onClosePanel()
+{
+	if (mPanelExperienceInfo)
+	{
+		onPanelExperienceClose(mPanelExperienceInfo);
+	}
+}
+
+void LLPanelExperiences::updateData()
+{
+	if(isDirty())
+	{
+		mNoExperiences = false;
+	}
+}
+
+LLExperienceItem* LLPanelExperiences::getSelectedExperienceItem()
+{
+	LLPanel* selected_item = mExperiencesList->getSelectedItem();
+	if (!selected_item) return NULL;
+
+	return dynamic_cast<LLExperienceItem*>(selected_item);
+}
+
+void LLPanelExperiences::setProfilePanel( LLPanelProfile* profile_panel )
+{
+	mProfilePanel = profile_panel;
+}
+
+void LLPanelExperiences::onListCommit( const LLFlatListView* f_list )
+{
+	if(f_list == mExperiencesList)
+	{
+		mExperiencesList->resetSelection(true);
+	}
+	else
+	{
+		llwarns << "Unknown list" << llendl;
+	}
+	
+	//updateButtons();
+}
+
+void LLPanelExperiences::onAccordionStateChanged( const LLAccordionCtrlTab* acc_tab )
+{
+	if(!mExperiencesAccTab->getDisplayChildren())
+	{
+		mExperiencesList->resetSelection(true);
+	}
+
+}
+
+void LLPanelExperiences::openExperienceInfo()
+{
+	LLSD selected_value = mExperiencesList->getSelectedValue();
+	if(selected_value.isUndefined())
+	{
+		return;
+	}
+
+	LLExperienceItem* experience = (LLExperienceItem*)mExperiencesList->getSelectedItem();
+
+	createExperienceInfoPanel();
+
+	LLSD params;
+	params["experience_name"] = experience->getExperienceName();
+	params["experience_desc"] = experience->getExperienceDescription();
+
+	getProfilePanel()->openPanel(mPanelExperienceInfo, params);
+
+}
+
+
+void LLPanelExperiences::createExperienceInfoPanel()
+{
+	if(!mPanelExperienceInfo)
+	{
+		mPanelExperienceInfo = LLPanelExperienceInfo::create();
+		mPanelExperienceInfo->setExitCallback(boost::bind(&LLPanelExperiences::onPanelExperienceClose, this, mPanelExperienceInfo));
+		mPanelExperienceInfo->setVisible(FALSE);
+	}
+}
+
+void LLPanelExperiences::onPanelExperienceClose( LLPanel* panel )
+{
+	getProfilePanel()->closePanel(panel);
+}
+
+LLPanelProfile* LLPanelExperiences::getProfilePanel()
+{
+	llassert_always(NULL != mProfilePanel);
+	
+	return mProfilePanel;
+}
+
+
+
+
+
+
+
+
+
+
+
+LLExperienceItem::LLExperienceItem()
+{
+	buildFromFile("panel_experience_info.xml");
+}
+
+void LLExperienceItem::init( LLSD* experience_data )
+{
+	if(experience_data)
+	{
+		setExperienceDescription(experience_data->has(LLExperienceCache::PUBLIC_KEY)?(*experience_data)[LLExperienceCache::PUBLIC_KEY].asString() : std::string());
+		setExperienceName(experience_data->has(LLExperienceCache::NAME)?(*experience_data)[LLExperienceCache::NAME].asString() : std::string());
+	}
+}
+
+void LLExperienceItem::setExperienceDescription( const std::string& val )
+{
+	mExperienceDescription = val;
+	getChild<LLUICtrl>("experience_desc")->setValue(val);
+}
+
+void LLExperienceItem::setExperienceName( const std::string& val )
+{
+	mExperienceName = val;
+	getChild<LLUICtrl>("experience_name")->setValue(val);
+}
+
+BOOL LLExperienceItem::postBuild()
+{
+	return TRUE;
+}
+
+void LLExperienceItem::update()
+{
+
+}
+
+void LLExperienceItem::processProperties( void* data, EAvatarProcessorType type )
+{
+
+}
+
+LLExperienceItem::~LLExperienceItem()
+{
+
+}
+
+
+void LLPanelExperienceInfo::setExperienceName( const std::string& name )
+{
+	getChild<LLUICtrl>("experience_name")->setValue(name);
+}
+
+void LLPanelExperienceInfo::setExperienceDesc( const std::string& desc )
+{
+	getChild<LLUICtrl>("experience_desc")->setValue(desc);
+}
+
+void LLPanelExperienceInfo::onOpen( const LLSD& key )
+{
+	setExperienceName(key["experience_name"]);
+	setExperienceDesc(key["experience_desc"]);
+
+	/*
+	LLAvatarPropertiesProcessor::getInstance()->addObserver(
+	getAvatarId(), this);
+	LLAvatarPropertiesProcessor::getInstance()->sendPickInfoRequest(
+	getAvatarId(), getPickId());
+	*/
+}
+
+LLPanelExperienceInfo* LLPanelExperienceInfo::create()
+{
+	LLPanelExperienceInfo* panel = new LLPanelExperienceInfo();
+	panel->buildFromFile("panel_experience_info.xml");
+	return panel;
+}
+
+void LLPanelExperienceInfo::setExitCallback( const commit_callback_t& cb )
+{
+	getChild<LLButton>("back_btn")->setClickedCallback(cb);
+}
diff --git a/indra/newview/llpanelexperiences.h b/indra/newview/llpanelexperiences.h
new file mode 100644
index 0000000000..1fe3f6ae1d
--- /dev/null
+++ b/indra/newview/llpanelexperiences.h
@@ -0,0 +1,119 @@
+/** 
+ * @file llpanelpicks.h
+ * @brief LLPanelPicks and related class definitions
+ *
+ * $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_LLPANELEXPERIENCES_H
+#define LL_LLPANELEXPERIENCES_H
+
+#include "llaccordionctrltab.h"
+#include "llflatlistview.h"
+#include "llpanelavatar.h"
+
+class LLExperienceItem;
+class LLPanelProfile; 
+
+class LLPanelExperienceInfo
+	: public LLPanel
+{
+public:
+	static LLPanelExperienceInfo* create();
+	
+	void onOpen(const LLSD& key);
+	void setExperienceName( const std::string& name );
+	void setExperienceDesc( const std::string& desc );
+
+
+	virtual void setExitCallback(const commit_callback_t& cb);
+};
+
+
+class LLPanelExperiences
+	: public LLPanel /*LLPanelProfileTab*/
+{
+public:
+	LLPanelExperiences();
+
+	static void* create(void* data);
+
+	/*virtual*/ BOOL postBuild(void);
+
+	/*virtual*/ void onOpen(const LLSD& key);
+
+	/*virtual*/ void onClosePanel();
+
+	void updateData();
+
+	LLExperienceItem* getSelectedExperienceItem();
+
+	void setProfilePanel(LLPanelProfile* profile_panel);
+	void addExperienceInfo(const LLSD& experience);
+protected:
+
+	void onListCommit(const LLFlatListView* f_list);
+	void onAccordionStateChanged(const LLAccordionCtrlTab* acc_tab);
+
+
+	void openExperienceInfo();
+	void createExperienceInfoPanel();
+	void onPanelExperienceClose(LLPanel* panel);
+	LLPanelProfile* getProfilePanel();
+private:
+	LLFlatListView* mExperiencesList;
+	LLAccordionCtrlTab* mExperiencesAccTab;
+	LLPanelProfile* mProfilePanel;
+	LLPanelExperienceInfo* mPanelExperienceInfo;
+	bool mNoExperiences;
+};
+
+
+class LLExperienceItem 
+	: public LLPanel
+	//, public LLAvatarPropertiesObserver
+{
+public:
+	LLExperienceItem();
+	~LLExperienceItem();
+
+	void init(LLSD* experience_data);
+	/*virtual*/ BOOL postBuild();
+	void update();
+
+	/*virtual*/ void processProperties(void* data, EAvatarProcessorType type);
+
+	void setCreatorID(const LLUUID& val) { mCreatorID = val; }
+	void setExperienceDescription(const std::string& val);
+	void setExperienceName(const std::string& val);
+
+	const LLUUID& getCreatorID() const { return mCreatorID; }
+	const std::string& getExperienceName() const { return mExperienceName; }
+	const std::string& getExperienceDescription() const { return mExperienceDescription; }
+
+protected:
+	LLUUID mCreatorID;
+
+	std::string mExperienceName;
+	std::string mExperienceDescription;
+};
+#endif // LL_LLPANELEXPERIENCES_H
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 9c25e69db0..98abd2c9dd 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -86,6 +86,7 @@
 #include "lltrans.h"
 #include "llviewercontrol.h"
 #include "llappviewer.h"
+#include "llexperiencecache.h"
 
 const std::string HELLO_LSL =
 	"default\n"
@@ -370,12 +371,21 @@ LLScriptEdCore::~LLScriptEdCore()
 	delete mLiveFile;
 }
 
+void LLScriptEdCore::experienceChanged()
+{
+	enableSave(TRUE);
+	getChildView("Save_btn")->setEnabled(true);
+}
+
 BOOL LLScriptEdCore::postBuild()
 {
 	mErrorList = getChild<LLScrollListCtrl>("lsl errors");
 
 	mFunctions = getChild<LLComboBox>( "Insert...");
 
+	mExperiences = getChild<LLComboBox>("Experiences...");
+	mExperiences->setCommitCallback(boost::bind(&LLScriptEdCore::experienceChanged, this));
+
 	childSetCommitCallback("Insert...", &LLScriptEdCore::onBtnInsertFunction, this);
 
 	mEditor = getChild<LLViewerTextEditor>("Script Editor");
@@ -385,6 +395,10 @@ BOOL LLScriptEdCore::postBuild()
 	childSetAction("Edit_btn", boost::bind(&LLScriptEdCore::openInExternalEditor, this));
 
 	initMenu();
+	
+
+
+	requestExperiences();
 
 
 	std::vector<std::string> funcs;
@@ -1187,6 +1201,86 @@ bool LLScriptEdCore::enableLoadFromFileMenu(void* userdata)
 	return (self && self->mEditor) ? self->mEditor->canLoadOrSaveToFile() : FALSE;
 }
 
+
+void AddExperienceResult(LLHandle<LLScriptEdCore> panel, const LLSD& experience)
+{
+	LLScriptEdCore* scriptCore = panel.get();
+	if(scriptCore)
+	{
+		scriptCore->addExperienceInfo(experience);
+	}
+}
+
+
+class ExperienceResponder : public LLHTTPClient::Responder
+{
+public:
+	ExperienceResponder(const LLHandle<LLScriptEdCore>& parent):mParent(parent)
+	{
+	}
+
+	LLHandle<LLScriptEdCore> mParent;
+
+	virtual void result(const LLSD& content)
+	{
+		LLScriptEdCore* scriptCore = mParent.get();
+		if(!scriptCore)
+			return;
+
+		scriptCore->clearExperiences();
+
+		LLSD experiences = content["experiences"];
+		LLSD::array_const_iterator it = experiences.beginArray();
+		for( /**/ ; it != experiences.endArray(); ++it)
+		{
+			LLUUID public_key = it->asUUID();
+
+			LLExperienceCache::get(public_key, LLExperienceCache::PUBLIC_KEY, boost::bind(AddExperienceResult, mParent, _1));
+		}
+	}
+};
+
+void LLScriptEdCore::requestExperiences()
+{
+	mExperiences->setEnabled(FALSE);
+
+	LLViewerRegion* region = gAgent.getRegion();
+	if (region)
+	{
+		std::string lookup_url=region->getCapability("GetExperiences"); 
+		if(!lookup_url.empty())
+		{
+			LLHTTPClient::get(lookup_url, new ExperienceResponder(getDerivedHandle<LLScriptEdCore>()));
+		}
+	}
+}
+
+void LLScriptEdCore::addExperienceInfo( const LLSD& experience )
+{
+	mExperiences->setEnabled(TRUE);
+	mExperiences->add(experience[LLExperienceCache::NAME], experience);
+}
+
+void LLScriptEdCore::clearExperiences()
+{
+	mExperiences->removeall();
+	mExperiences->add("No Experience");
+}
+
+LLUUID LLScriptEdCore::getSelectedExperience()const
+{
+	LLSD value = mExperiences->getSelectedValue();
+	if(value.has(LLExperienceCache::PUBLIC_KEY))
+	{
+		return value[LLExperienceCache::PUBLIC_KEY].asUUID();
+	}
+	return LLUUID::null;
+}
+
+
+
+
+
 /// ---------------------------------------------------------------------------
 /// LLScriptEdContainer
 /// ---------------------------------------------------------------------------
@@ -2142,8 +2236,8 @@ void LLLiveLSLEditor::saveIfNeeded(bool sync /*= true*/)
 	mPendingUploads++;
 	BOOL is_running = getChild<LLCheckBoxCtrl>( "running")->get();
 	if (!url.empty())
-	{
-		uploadAssetViaCaps(url, filename, mObjectUUID, mItemUUID, is_running);
+	{		
+		uploadAssetViaCaps(url, filename, mObjectUUID, mItemUUID, is_running, mScriptEd->getSelectedExperience());
 	}
 	else if (gAssetStorage)
 	{
@@ -2151,11 +2245,7 @@ void LLLiveLSLEditor::saveIfNeeded(bool sync /*= true*/)
 	}
 }
 
-void LLLiveLSLEditor::uploadAssetViaCaps(const std::string& url,
-										 const std::string& filename,
-										 const LLUUID& task_id,
-										 const LLUUID& item_id,
-										 BOOL is_running)
+void LLLiveLSLEditor::uploadAssetViaCaps( const std::string& url, const std::string& filename, const LLUUID& task_id, const LLUUID& item_id, BOOL is_running, const LLUUID& experience_public_id )
 {
 	llinfos << "Update Task Inventory via capability " << url << llendl;
 	LLSD body;
@@ -2163,6 +2253,7 @@ void LLLiveLSLEditor::uploadAssetViaCaps(const std::string& url,
 	body["item_id"] = item_id;
 	body["is_script_running"] = is_running;
 	body["target"] = monoChecked() ? "mono" : "lsl2";
+	body["experience"] = experience_public_id;
 	LLHTTPClient::post(url, body,
 		new LLUpdateTaskInventoryResponder(body, filename, LLAssetType::AT_LSL_TEXT));
 }
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index 7563cecd9d..27252d17a1 100644
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -106,6 +106,9 @@ public:
 	static bool		enableLoadFromFileMenu(void* userdata);
 
 	virtual bool	hasAccelerators() const { return true; }
+	void			addExperienceInfo( const LLSD& experience );
+	void			clearExperiences();
+	LLUUID 			getSelectedExperience()const;
 
 private:
 	void		onBtnHelp();
@@ -120,6 +123,9 @@ private:
 	
 	void enableSave(BOOL b) {mEnableSave = b;}
 
+	void requestExperiences();
+	void experienceChanged();
+
 protected:
 	void deleteBridges();
 	void setHelpPage(const std::string& help_string);
@@ -135,6 +141,7 @@ private:
 	void			(*mSearchReplaceCallback) (void* userdata);
 	void*			mUserdata;
 	LLComboBox		*mFunctions;
+	LLComboBox		*mExperiences;
 	BOOL			mForceClose;
 	LLPanel*		mCodePanel;
 	LLScrollListCtrl* mErrorList;
@@ -237,11 +244,7 @@ private:
 	virtual void loadAsset();
 	void loadAsset(BOOL is_new);
 	/*virtual*/ void saveIfNeeded(bool sync = true);
-	void uploadAssetViaCaps(const std::string& url,
-							const std::string& filename, 
-							const LLUUID& task_id,
-							const LLUUID& item_id,
-							BOOL is_running);
+	void uploadAssetViaCaps(const std::string& url, const std::string& filename, const LLUUID& task_id, const LLUUID& item_id, BOOL is_running, const LLUUID& experience_public_id);
 	void uploadAssetLegacy(const std::string& filename,
 						   LLViewerObject* object,
 						   const LLTransactionID& tid,
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 0e3007724b..33782a12e5 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -47,6 +47,7 @@
 
 #include "llares.h"
 #include "llavatarnamecache.h"
+#include "llexperiencecache.h"
 #include "lllandmark.h"
 #include "llcachename.h"
 #include "lldir.h"
@@ -1396,6 +1397,9 @@ bool idle_startup()
 		LLStartUp::initNameCache();
 		display_startup();
 
+		LLStartUp::initExperienceCache();
+		display_startup();
+
 		// update the voice settings *after* gCacheName initialization
 		// so that we can construct voice UI that relies on the name cache
 		LLVoiceClient::getInstance()->updateSettings();
@@ -2807,6 +2811,13 @@ void LLStartUp::initNameCache()
 	LLAvatarNameCache::setUseDisplayNames(gSavedSettings.getBOOL("UseDisplayNames"));
 }
 
+
+void LLStartUp::initExperienceCache()
+{
+	LLAppViewer::instance()->loadExperienceCache();
+	LLExperienceCache::initClass();
+}
+
 void LLStartUp::cleanupNameCache()
 {
 	LLAvatarNameCache::cleanupClass();
@@ -3502,3 +3513,4 @@ void transition_back_to_login_panel(const std::string& emsg)
 	reset_login(); // calls LLStartUp::setStartupState( STATE_LOGIN_SHOW );
 	gSavedSettings.setBOOL("AutoLogin", FALSE);
 }
+
diff --git a/indra/newview/llstartup.h b/indra/newview/llstartup.h
index 760e38890b..00e03bcda6 100644
--- a/indra/newview/llstartup.h
+++ b/indra/newview/llstartup.h
@@ -91,6 +91,7 @@ public:
 	static void fontInit();
 
 	static void initNameCache();
+	static void initExperienceCache();
 	
 	static void cleanupNameCache();
 
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 1f7cf0cdd4..5582d256f8 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -56,6 +56,7 @@
 #include "llfloatereditsky.h"
 #include "llfloatereditwater.h"
 #include "llfloaterenvironmentsettings.h"
+#include "llfloaterexperiences.h"
 #include "llfloaterevent.h"
 #include "llfloaterdestinations.h"
 #include "llfloaterfonttest.h"
@@ -204,7 +205,8 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("env_edit_day_cycle", "floater_edit_day_cycle.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEditDayCycle>);
 
 	LLFloaterReg::add("event", "floater_event.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEvent>);
-	
+	LLFloaterReg::add("experiences", "floater_experiences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterExperiences>);
+
 	LLFloaterReg::add("font_test", "floater_font_test.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFontTest>);
 
 	LLFloaterReg::add("gestures", "floater_gesture.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterGesture>);
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index e4234a538d..70fb5d08e5 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1532,6 +1532,8 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	}
 
 	capabilityNames.append("GetDisplayNames");
+	capabilityNames.append("GetExperiences");
+	capabilityNames.append("GetExperienceInfo");
 	capabilityNames.append("GetMesh");
 	capabilityNames.append("GetObjectCost");
 	capabilityNames.append("GetObjectPhysicsData");
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 62e93b7a53..33d910bc37 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -48,6 +48,7 @@
 #include "llanimationstates.h"
 #include "llavatarnamecache.h"
 #include "llavatarpropertiesprocessor.h"
+#include "llexperiencecache.h"
 #include "llphysicsmotion.h"
 #include "llviewercontrol.h"
 #include "llcallingcard.h"		// IDEVO for LLAvatarTracker
@@ -2501,7 +2502,7 @@ void LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 		idleUpdateBelowWater();	// wind effect uses this
 		idleUpdateWindEffect();
 	}
-	
+		
 	idleUpdateNameTag( root_pos_last );
 	idleUpdateRenderCost();
 }
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 caa36e7302..f007e0e735 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -53,6 +53,14 @@
          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">
         <menu_item_call.on_click
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>
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>