From 4c68faec400e4c6d75a53528d8064a3448707158 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Wed, 5 Dec 2012 19:34:27 +0100
Subject: Added LLMaterialMgr::getAll() to retrieve all materials for the
 specified region

---
 indra/newview/llfloaterdebugmaterials.h | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'indra/newview/llfloaterdebugmaterials.h')

diff --git a/indra/newview/llfloaterdebugmaterials.h b/indra/newview/llfloaterdebugmaterials.h
index a40e1d1b5c..f7ee3a0d2b 100644
--- a/indra/newview/llfloaterdebugmaterials.h
+++ b/indra/newview/llfloaterdebugmaterials.h
@@ -34,6 +34,7 @@
 
 #include "llfloater.h"
 #include "llmaterial.h"
+#include "llmaterialmgr.h"
 #include "lluuid.h"
 #include "v4color.h"
 
@@ -106,7 +107,8 @@ private:
 	void          requestPutMaterials(bool pIsDoSet);
 	void          requestPutMaterials(const LLUUID& regionId, bool pIsDoSet);
 
-	static void   onGetMaterial(const LLMaterialID& material_id, const LLMaterialPtr materialp);
+	static void   onGetMaterials(const LLUUID& region_id, const LLMaterialMgr::material_map_t& materials);
+	static void   onPostMaterial(const LLMaterialID& material_id, const LLMaterialPtr materialp);
 
 	void          parseGetResponse();
 	void          parseQueryViewableObjects();
@@ -120,10 +122,6 @@ private:
 	void          clearPostResults();
 	void          clearViewableObjectsResults();
 
-	void          setUnparsedGetData(const LLSD& pGetData);
-	void          clearUnparsedGetData();
-	void          updateGetParsingStatus();
-
 	void          setUnparsedQueryData();
 	void          clearUnparsedQueryData();
 	void          updateQueryParsingStatus();
@@ -179,9 +177,6 @@ private:
 	boost::signals2::connection mTeleportFailedConnection;
 	boost::signals2::connection mSelectionUpdateConnection;
 
-	LLSD                        mUnparsedGetData;
-	S32                         mNextUnparsedGetDataIndex;
-
 	S32                         mNextUnparsedQueryDataIndex;
 };
 
-- 
cgit v1.2.3