summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2013-02-25 00:16:14 +0100
committerKitty Barnett <develop@catznip.com>2013-02-25 00:16:14 +0100
commitfbf8e51c6059791b12f60602b4dda0d72dc2d847 (patch)
tree8b441c42ee6acd843d219c5c93b18c3fe1225970 /indra/newview
parent4d1446766a91c8227a936bc4ae2c62d90f2aa3b5 (diff)
Added LLMaterialMgr::remove() to remove material information from a face
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llmaterialmgr.cpp5
-rw-r--r--indra/newview/llmaterialmgr.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llmaterialmgr.cpp b/indra/newview/llmaterialmgr.cpp
index de82ec80c8..253b0c124e 100644
--- a/indra/newview/llmaterialmgr.cpp
+++ b/indra/newview/llmaterialmgr.cpp
@@ -246,6 +246,11 @@ void LLMaterialMgr::put(const LLUUID& object_id, const U8 te, const LLMaterial&
}
}
+void LLMaterialMgr::remove(const LLUUID& object_id, const U8 te)
+{
+ put(object_id, te, LLMaterial::null);
+}
+
const LLMaterialPtr LLMaterialMgr::setMaterial(const LLUUID& region_id, const LLMaterialID& material_id, const LLSD& material_data)
{
LL_DEBUGS("Materials") << "region " << region_id << " material id " << material_id << LL_ENDL;
diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h
index 1672d11d38..6f444309d3 100644
--- a/indra/newview/llmaterialmgr.h
+++ b/indra/newview/llmaterialmgr.h
@@ -50,6 +50,7 @@ public:
void getAll(const LLUUID& region_id);
boost::signals2::connection getAll(const LLUUID& region_id, getall_callback_t::slot_type cb);
void put(const LLUUID& object_id, const U8 te, const LLMaterial& material);
+ void remove(const LLUUID& object_id, const U8 te);
protected:
void clearGetQueues(const LLUUID& region_id);