summaryrefslogtreecommitdiff
path: root/indra/newview/llmaterialmgr.h
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2013-02-28 23:19:41 +0100
committerKitty Barnett <develop@catznip.com>2013-02-28 23:19:41 +0100
commit5ba7be081273d4eb4dac3f66e82b33b44f62580a (patch)
tree691986ca713ef3d34592f4747412fcf8223925dd /indra/newview/llmaterialmgr.h
parente71de8619e2d46bf900f0b5e3bda082800e4fdb4 (diff)
Mark a material as 'pending' from the very first call to LLMaterialMgr::get()
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 6f444309d3..39be5cab29 100644
--- a/indra/newview/llmaterialmgr.h
+++ b/indra/newview/llmaterialmgr.h
@@ -54,8 +54,9 @@ public:
protected:
void clearGetQueues(const LLUUID& region_id);
- bool isGetPending(const LLUUID& region_id, const LLMaterialID& material_id);
- bool isGetAllPending(const LLUUID& region_id);
+ bool isGetPending(const LLUUID& region_id, const LLMaterialID& material_id) const;
+ bool isGetAllPending(const LLUUID& region_id) const;
+ void markGetPending(const LLUUID& region_id, const LLMaterialID& material_id);
const LLMaterialPtr setMaterial(const LLUUID& region_id, const LLMaterialID& material_id, const LLSD& material_data);
static void onIdle(void*);