Started LLMaterialMgr to handle viewer<->region materials communication

  * refactored LLFloaterDebugMaterials::requestPutMaterials() to use LLMaterialMgr instead
  * replaced "Object editing" results list with information about the active selection instead

1 files changed, 53 insertions, 0 deletions

diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h
new file mode 100644
index 0000000000..c4e1c01389
--- /dev/null
+++ b/indra/newview/llmaterialmgr.h
@@ -0,0 +1,53 @@
+/**
+ * @file llmaterialmgr.h
+ * @brief Material manager
+ *
+ * $LicenseInfo:firstyear=2006&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, 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_LLMATERIALMGR_H
+#define LL_LLMATERIALMGR_H
+
+#include "llmaterial.h"
+#include "llsingleton.h"
+
+class LLMaterialMgr : public LLSingleton<LLMaterialMgr>
+{
+	friend LLSingleton<LLMaterialMgr>;
+protected:
+	LLMaterialMgr();
+	virtual ~LLMaterialMgr();
+
+public:
+	void put(const LLUUID& object_id, const U8 te, const LLMaterial& material);
+	void processPutQueue();
+
+protected:
+	void onPutResponse(bool success, const LLSD& content, const LLUUID& object_id);
+
+protected:
+	typedef std::map<U8, LLMaterial> facematerial_map_t;
+	typedef std::map<LLUUID, facematerial_map_t> put_queue_t;
+	put_queue_t mPutQueue;
+};
+
+#endif // LL_LLMATERIALMGR_H