diff options
| author | Kitty Barnett <develop@catznip.com> | 2013-05-12 16:10:31 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2013-05-12 16:10:31 +0200 |
| commit | 5ac9d9cb05f22099bea8c9312f5e0b234430022a (patch) | |
| tree | dbbc463c82b74e5003fd430308d56f0abad8361f /indra/newview/llmaterialmgr.cpp | |
| parent | c2c9380fe135fd8b191ebe3c9a38129af4994ed8 (diff) | |
LLMaterialMgr::get() doesn't handle a callback request for LLMaterialID::null
Diffstat (limited to 'indra/newview/llmaterialmgr.cpp')
| -rw-r--r-- | indra/newview/llmaterialmgr.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llmaterialmgr.cpp b/indra/newview/llmaterialmgr.cpp index fb8cffa4ef..f217ff160e 100644 --- a/indra/newview/llmaterialmgr.cpp +++ b/indra/newview/llmaterialmgr.cpp @@ -116,6 +116,7 @@ void LLMaterialsResponder::error(U32 pStatus, const std::string& pReason) LLMaterialMgr::LLMaterialMgr() { + mMaterials.insert(std::pair<LLMaterialID, LLMaterialPtr>(LLMaterialID::null, LLMaterialPtr(NULL))); gIdleCallbacks.addFunction(&LLMaterialMgr::onIdle, NULL); LLWorld::instance().setRegionRemovedCallback(boost::bind(&LLMaterialMgr::onRegionRemoved, this, _1)); } |