livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in lindenlab/viewer-lynx

AndreyL ProductEngine 2018-04-24 18:56:43 +03:00
parent 66502df050 7ce880150f
commit eedf3e7f46
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
indra/newview/llvovolume.cpp
View File

@ -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;
}
}

2
indra/newview/skins/default/xui/de/notifications.xml
View File

@ -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">