diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-04-24 18:56:43 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-04-24 18:56:43 +0300 |
| commit | eedf3e7f4664e9b0ff60e8e392bb22ea1e7af076 (patch) | |
| tree | 8036348860eb1086d9692a949aade0bf07ebf58d /indra | |
| parent | 66502df0502f1c2aa6aa9fda0a2a61921535a645 (diff) | |
| parent | 7ce880150fe7d2f333f207b5c8ed5672c8c8cfb0 (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 29 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/de/notifications.xml | 2 |
2 files changed, 20 insertions, 11 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 9b0d9f4a7b..c1ecfd07c1 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -266,9 +266,10 @@ void LLVOVolume::markDead() { mSculptTexture->removeVolume(LLRender::SCULPT_TEX, this); } - if (hasLightTexture()) + + if (mLightTexture.notNull()) { - getLightTexture()->removeVolume(LLRender::LIGHT_TEX, this); + mLightTexture->removeVolume(LLRender::LIGHT_TEX, this); } } @@ -2850,8 +2851,8 @@ void LLVOVolume::setLightTextureID(LLUUID id) { setParameterEntryInUse(LLNetworkData::PARAMS_LIGHT_IMAGE, TRUE, true); } - else - { + else if (old_texturep) + { old_texturep->removeVolume(LLRender::LIGHT_TEX, this); } LLLightImageParams* param_block = (LLLightImageParams*) getParameterEntry(LLNetworkData::PARAMS_LIGHT_IMAGE); @@ -2860,17 +2861,25 @@ void LLVOVolume::setLightTextureID(LLUUID id) param_block->setLightTexture(id); parameterChanged(LLNetworkData::PARAMS_LIGHT_IMAGE, true); } - getLightTexture()->addVolume(LLRender::LIGHT_TEX, this); // new texture + LLViewerTexture* tex = getLightTexture(); + if (tex) + { + tex->addVolume(LLRender::LIGHT_TEX, this); // new texture + } + else + { + LL_WARNS() << "Can't get light texture for ID " << id.asString() << LL_ENDL; + } } - else + else if (hasLightTexture()) { - if (hasLightTexture()) + if (old_texturep) { old_texturep->removeVolume(LLRender::LIGHT_TEX, this); - setParameterEntryInUse(LLNetworkData::PARAMS_LIGHT_IMAGE, FALSE, true); - parameterChanged(LLNetworkData::PARAMS_LIGHT_IMAGE, true); - mLightTexture = NULL; } + setParameterEntryInUse(LLNetworkData::PARAMS_LIGHT_IMAGE, FALSE, true); + parameterChanged(LLNetworkData::PARAMS_LIGHT_IMAGE, true); + mLightTexture = NULL; } } diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index 3c979c56c3..aefe30813c 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -2505,7 +2505,7 @@ Möchten Sie den Nicht-stören-Modus deaktivieren, bevor Sie diese Transaktion a <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> </notification> <notification name="ConfirmEmptyTrash"> - [COUNT] bestellungen und Ordner werden dauerhaft gelöscht. Sind Sie sicher, dass Sie den Inhalt Ihres Papierkorbs dauerhaft löschen möchten? + [COUNT] Bestellungen und Ordner werden dauerhaft gelöscht. Sind Sie sicher, dass Sie den Inhalt Ihres Papierkorbs dauerhaft löschen möchten? <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> </notification> <notification name="TrashIsFull"> |