From c08072a0508cefc6bfc8c05937e984a095f323ce Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Thu, 3 Sep 2015 11:10:32 -0700
Subject: Moved group experiences into experience cache. Use coros and new HTTP
 libs.

---
 indra/newview/llcompilequeue.cpp          |  2 +-
 indra/newview/llpanelgroupexperiences.cpp | 56 +++++++++++--------------------
 indra/newview/llpanelgroupexperiences.h   |  3 ++
 3 files changed, 23 insertions(+), 38 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp
index f763a59c94..b52ccffed9 100755
--- a/indra/newview/llcompilequeue.cpp
+++ b/indra/newview/llcompilequeue.cpp
@@ -358,7 +358,7 @@ void LLFloaterCompileQueue::handleInventory(LLViewerObject *viewer_object,
 				viewer_object->getID(), itemp);
 
             LLExperienceCache::getInstance()->fetchAssociatedExperience(itemp->getParentUUID(), itemp->getUUID(),
-                    boost::bind(LLFloaterCompileQueue::requestAsset, datap, _1));
+                    boost::bind(&LLFloaterCompileQueue::requestAsset, datap, _1));
 		}
 	}
 }
diff --git a/indra/newview/llpanelgroupexperiences.cpp b/indra/newview/llpanelgroupexperiences.cpp
index 76b68122fb..067f9eb426 100644
--- a/indra/newview/llpanelgroupexperiences.cpp
+++ b/indra/newview/llpanelgroupexperiences.cpp
@@ -37,39 +37,11 @@
 #include "llflatlistview.h"
 #include "llpanelexperiences.h"
 #include "llsd.h"
-
+#include "llexperiencecache.h"
 
 static LLPanelInjector<LLPanelGroupExperiences> t_panel_group_experiences("panel_group_experiences");
 
 
-class LLGroupExperienceResponder : public LLHTTPClient::Responder
-{
-public:
-	LLHandle<LLPanelGroupExperiences> mHandle;
-
-	LLGroupExperienceResponder(LLHandle<LLPanelGroupExperiences> handle) : mHandle(handle) { }
-
-protected:
-	/*virtual*/ void httpSuccess()
-	{
-		if (mHandle.isDead())
-		{
-			return;
-		}
-
-		LLPanelGroupExperiences* panel = mHandle.get();
-		if (panel)
-		{
-			panel->setExperienceList(getContent().get("experience_ids"));
-		}
-	}
-
-	/*virtual*/ void httpFailure()
-	{
-		LL_WARNS() << "experience responder failed [status:" << getStatus() << "]: " << getContent() << LL_ENDL;
-	}
-};
-
 LLPanelGroupExperiences::LLPanelGroupExperiences()
 :	LLPanelGroupTab(), mExperiencesList(NULL)
 {
@@ -101,14 +73,8 @@ void LLPanelGroupExperiences::activate()
 		return;
 	}
 
-	// search for experiences owned by the current group
-	std::string url = gAgent.getRegion()->getCapability("GroupExperiences"); 
-	if (!url.empty())
-	{
-		url += "?" + getGroupID().asString();
-		
-		LLHTTPClient::get(url, new LLGroupExperienceResponder(getDerivedHandle<LLPanelGroupExperiences>()));
-	}
+    LLExperienceCache::getInstance()->getGroupExperiences(getGroupID(),
+        boost::bind(&LLPanelGroupExperiences::groupExperiencesResults, getDerivedHandle<LLPanelGroupExperiences>(), _1));
 }
 
 void LLPanelGroupExperiences::setGroupID(const LLUUID& id)
@@ -141,3 +107,19 @@ void LLPanelGroupExperiences::setExperienceList(const LLSD& experiences)
         mExperiencesList->addItem(item, public_key);
     }
 }
+
+/*static*/
+void LLPanelGroupExperiences::groupExperiencesResults(LLHandle<LLPanelGroupExperiences> handle, const LLSD &experiences)
+{
+    if (handle.isDead())
+    {
+        return;
+    }
+
+    LLPanelGroupExperiences* panel = handle.get();
+    if (panel)
+    {
+        panel->setExperienceList(experiences);
+    }
+
+}
diff --git a/indra/newview/llpanelgroupexperiences.h b/indra/newview/llpanelgroupexperiences.h
index ae1ecc1ac5..7c79f77332 100644
--- a/indra/newview/llpanelgroupexperiences.h
+++ b/indra/newview/llpanelgroupexperiences.h
@@ -48,6 +48,9 @@ public:
 
 protected:
 	LLFlatListView* mExperiencesList;
+
+private:
+    static void groupExperiencesResults(LLHandle<LLPanelGroupExperiences>, const LLSD &);
 };
 
 #endif
-- 
cgit v1.2.3