summaryrefslogtreecommitdiff
path: root/indra/newview/llmaterialmgr.h
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2012-12-03 15:46:49 +0100
committerKitty Barnett <develop@catznip.com>2012-12-03 15:46:49 +0100
commit1e194eb412bb10c1733ed76e270e45578ac15e0b (patch)
treef4201c8a754f5dcd5b0ffc5d4dd45b72eded23c6 /indra/newview/llmaterialmgr.h
parent25bffc3d43ec7696c0a9fab43514affbfe006fb9 (diff)
Handle delayed requesting and sending of materials through an idle callback
Diffstat (limited to 'indra/newview/llmaterialmgr.h')
-rw-r--r--indra/newview/llmaterialmgr.h5
1 files changed, 3 insertions, 2 deletions
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: