summaryrefslogtreecommitdiff
path: root/indra/newview/llmaterialmgr.h
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2013-02-18 19:37:19 +0100
committerKitty Barnett <develop@catznip.com>2013-02-18 19:37:19 +0100
commitb4a87776d4207c4268b5c0d546790eeb45db1e75 (patch)
tree517dbd9130e7410a0b66b90125e3b4f007b7b487 /indra/newview/llmaterialmgr.h
parent64a4a13397ea7b895ebbeb707bdba72e2d97ff6b (diff)
Prevent a failed GET from causing an infinite material request loop when there are still pending POST requests for the same region
Diffstat (limited to 'indra/newview/llmaterialmgr.h')
-rw-r--r--indra/newview/llmaterialmgr.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h
index 0b7217445a..1672d11d38 100644
--- a/indra/newview/llmaterialmgr.h
+++ b/indra/newview/llmaterialmgr.h
@@ -52,6 +52,7 @@ public:
void put(const LLUUID& object_id, const U8 te, const LLMaterial& material);
protected:
+ void clearGetQueues(const LLUUID& region_id);
bool isGetPending(const LLUUID& region_id, const LLMaterialID& material_id);
bool isGetAllPending(const LLUUID& region_id);
const LLMaterialPtr setMaterial(const LLUUID& region_id, const LLMaterialID& material_id, const LLSD& material_data);