From 1e194eb412bb10c1733ed76e270e45578ac15e0b Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Mon, 3 Dec 2012 15:46:49 +0100
Subject: Handle delayed requesting and sending of materials through an idle
 callback

---
 indra/newview/llmaterialmgr.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h
index d801d40c36..49d1029522 100644
--- a/indra/newview/llmaterialmgr.h
+++ b/indra/newview/llmaterialmgr.h
@@ -43,13 +43,14 @@ public:
 	const LLMaterialPtr         get(const LLMaterialID& material_id);
 	boost::signals2::connection get(const LLMaterialID& material_id, get_callback_t::slot_type cb);
 	void put(const LLUUID& object_id, const U8 te, const LLMaterial& material);
-	void processGetQueue();
-	void processPutQueue();
 
 protected:
 	bool isGetPending(const LLMaterialID& material_id);
 
+	static void onIdle(void*);
+	void processGetQueue();
 	void onGetResponse(bool success, const LLSD& content);
+	void processPutQueue();
 	void onPutResponse(bool success, const LLSD& content, const LLUUID& object_id);
 
 protected:
-- 
cgit v1.2.3