Updated experience cache to latest web service api

Added new CAP request for experiences the avatar can sign

3 files changed, 10 insertions, 9 deletions

diff --git a/indra/newview/llpanelexperiences.cpp b/indra/newview/llpanelexperiences.cpp
index 02a3c4c410..617ceef615 100644
--- a/indra/newview/llpanelexperiences.cpp
+++ b/indra/newview/llpanelexperiences.cpp
@@ -56,7 +56,7 @@ public:
 		{
 			LLUUID public_key = it->asUUID();
 
-			LLExperienceCache::get(public_key, LLExperienceCache::PUBLIC_KEY, boost::bind(ExperienceResult, mParent, _1));
+			LLExperienceCache::get(public_key, boost::bind(ExperienceResult, mParent, _1));
 		}
 	}
 };
@@ -73,9 +73,9 @@ void LLPanelExperiences::addExperienceInfo(const LLSD& experience)
 		item->setExperienceName(experience["error"].asString());
 	}
 
-	if(experience.has(LLExperienceCache::PUBLIC_KEY))
+	if(experience.has(LLExperienceCache::DESCRIPTION))
 	{
-		item->setExperienceDescription(experience[LLExperienceCache::PUBLIC_KEY].asString());
+		item->setExperienceDescription(experience[LLExperienceCache::DESCRIPTION].asString());
 	}
 
 	mExperiencesList->addItem(item);
@@ -228,7 +228,7 @@ void LLExperienceItem::init( LLSD* experience_data )
 {
 	if(experience_data)
 	{
-		setExperienceDescription(experience_data->has(LLExperienceCache::PUBLIC_KEY)?(*experience_data)[LLExperienceCache::PUBLIC_KEY].asString() : std::string());
+		setExperienceDescription(experience_data->has(LLExperienceCache::DESCRIPTION)?(*experience_data)[LLExperienceCache::DESCRIPTION].asString() : std::string());
 		setExperienceName(experience_data->has(LLExperienceCache::NAME)?(*experience_data)[LLExperienceCache::NAME].asString() : std::string());
 	}
 }
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 98abd2c9dd..ba16c4dde8 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -1229,13 +1229,13 @@ public:
 
 		scriptCore->clearExperiences();
 
-		LLSD experiences = content["experiences"];
+		LLSD experiences = content["experience_ids"];
 		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));
+			LLExperienceCache::get(public_key, boost::bind(AddExperienceResult, mParent, _1));
 		}
 	}
 };
@@ -1247,7 +1247,7 @@ void LLScriptEdCore::requestExperiences()
 	LLViewerRegion* region = gAgent.getRegion();
 	if (region)
 	{
-		std::string lookup_url=region->getCapability("GetExperiences"); 
+		std::string lookup_url=region->getCapability("GetCreatorExperiences"); 
 		if(!lookup_url.empty())
 		{
 			LLHTTPClient::get(lookup_url, new ExperienceResponder(getDerivedHandle<LLScriptEdCore>()));
@@ -1270,9 +1270,9 @@ void LLScriptEdCore::clearExperiences()
 LLUUID LLScriptEdCore::getSelectedExperience()const
 {
 	LLSD value = mExperiences->getSelectedValue();
-	if(value.has(LLExperienceCache::PUBLIC_KEY))
+	if(value.has(LLExperienceCache::EXPERIENCE_ID))
 	{
-		return value[LLExperienceCache::PUBLIC_KEY].asUUID();
+		return value[LLExperienceCache::EXPERIENCE_ID].asUUID();
 	}
 	return LLUUID::null;
 }
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 70fb5d08e5..351c371994 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1534,6 +1534,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("GetDisplayNames");
 	capabilityNames.append("GetExperiences");
 	capabilityNames.append("GetExperienceInfo");
+	capabilityNames.append("GetCreatorExperiences");
 	capabilityNames.append("GetMesh");
 	capabilityNames.append("GetObjectCost");
 	capabilityNames.append("GetObjectPhysicsData");