diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-17 18:06:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-17 18:06:24 -0400 |
| commit | 9ef64494559dce5f7c0afb271b591036054f01ce (patch) | |
| tree | 4815b3852eaf7c4465958a8c9c03865d3d84317b /indra/newview/llmaterialmgr.cpp | |
| parent | 4d62a56ff9bc9f2db5d85d5549e6bb7d8a84d04a (diff) | |
| parent | 2ff880ddb151ee3bb074f507f58f60bdebc458e8 (diff) | |
merge changes for lastest integrations
Diffstat (limited to 'indra/newview/llmaterialmgr.cpp')
| -rw-r--r-- | indra/newview/llmaterialmgr.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llmaterialmgr.cpp b/indra/newview/llmaterialmgr.cpp index 59e5d05736..edf8e83038 100644 --- a/indra/newview/llmaterialmgr.cpp +++ b/indra/newview/llmaterialmgr.cpp @@ -217,6 +217,7 @@ boost::signals2::connection LLMaterialMgr::get(const LLUUID& region_id, const LL return connection; } +#if USE_TE_SPECIFIC_REGISTRATION boost::signals2::connection LLMaterialMgr::getTE(const LLUUID& region_id, const LLMaterialID& material_id, U32 te, LLMaterialMgr::get_callback_te_t::slot_type cb) { boost::signals2::connection connection; @@ -261,6 +262,7 @@ boost::signals2::connection LLMaterialMgr::getTE(const LLUUID& region_id, const return connection; } +#endif bool LLMaterialMgr::isGetAllPending(const LLUUID& region_id) const { @@ -346,6 +348,7 @@ const LLMaterialPtr LLMaterialMgr::setMaterial(const LLUUID& region_id, const LL mGetCallbacks.erase(itCallback); } +#if USE_TE_SPECIFIC_REGISTRATION TEMaterialPair te_mat_pair; te_mat_pair.materialID = material_id; @@ -361,6 +364,7 @@ const LLMaterialPtr LLMaterialMgr::setMaterial(const LLUUID& region_id, const LL mGetTECallbacks.erase(itCallbackTE); } } +#endif return itMaterial->second; } @@ -779,3 +783,4 @@ void LLMaterialMgr::onRegionRemoved(LLViewerRegion* regionp) clearGetQueues(regionp->getRegionID()); // Put doesn't need clearing: objects that can't be found will clean up in processPutQueue() } + |