Merge viewer-lynx

Tue, 01 May 2018 16:45:50 +0200

author
Ansariel
date
Tue, 01 May 2018 16:45:50 +0200
changeset 55374
dba925f5b176
parent 55369
614b86c88ac6
parent 55373
7b6b020fd5ad
child 55375
87396b7b96ca

Merge viewer-lynx

indra/newview/llglsandbox.cpp file | annotate | diff | revisions
indra/newview/llvovolume.cpp file | annotate | diff | revisions
indra/newview/skins/default/xui/de/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/ru/panel_main_inventory.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/llvovolume.cpp	Tue May 01 16:43:38 2018 +0200
     1.2 +++ b/indra/newview/llvovolume.cpp	Tue May 01 16:45:50 2018 +0200
     1.3 @@ -281,9 +281,10 @@
     1.4  		{
     1.5  			mSculptTexture->removeVolume(LLRender::SCULPT_TEX, this);
     1.6  		}
     1.7 -		if (hasLightTexture())
     1.8 -		{
     1.9 -			getLightTexture()->removeVolume(LLRender::LIGHT_TEX, this);
    1.10 +
    1.11 +		if (mLightTexture.notNull())
    1.12 +		{
    1.13 +			mLightTexture->removeVolume(LLRender::LIGHT_TEX, this);
    1.14  		}
    1.15  	}
    1.16  	
    1.17 @@ -3037,8 +3038,8 @@
    1.18  		{
    1.19  			setParameterEntryInUse(LLNetworkData::PARAMS_LIGHT_IMAGE, TRUE, true);
    1.20  		}
    1.21 -		else
    1.22 -		{
    1.23 +		else if (old_texturep)
    1.24 +		{	
    1.25  			old_texturep->removeVolume(LLRender::LIGHT_TEX, this);
    1.26  		}
    1.27  		LLLightImageParams* param_block = (LLLightImageParams*) getParameterEntry(LLNetworkData::PARAMS_LIGHT_IMAGE);
    1.28 @@ -3047,17 +3048,25 @@
    1.29  			param_block->setLightTexture(id);
    1.30  			parameterChanged(LLNetworkData::PARAMS_LIGHT_IMAGE, true);
    1.31  		}
    1.32 -		getLightTexture()->addVolume(LLRender::LIGHT_TEX, this); // new texture
    1.33 -	}
    1.34 -	else
    1.35 -	{
    1.36 -		if (hasLightTexture())
    1.37 +		LLViewerTexture* tex = getLightTexture();
    1.38 +		if (tex)
    1.39 +		{
    1.40 +			tex->addVolume(LLRender::LIGHT_TEX, this); // new texture
    1.41 +		}
    1.42 +		else
    1.43 +		{
    1.44 +			LL_WARNS() << "Can't get light texture for ID " << id.asString() << LL_ENDL;
    1.45 +		}
    1.46 +	}
    1.47 +	else if (hasLightTexture())
    1.48 +	{
    1.49 +		if (old_texturep)
    1.50  		{
    1.51  			old_texturep->removeVolume(LLRender::LIGHT_TEX, this);
    1.52 -			setParameterEntryInUse(LLNetworkData::PARAMS_LIGHT_IMAGE, FALSE, true);
    1.53 -			parameterChanged(LLNetworkData::PARAMS_LIGHT_IMAGE, true);
    1.54 -			mLightTexture = NULL;
    1.55 -		}
    1.56 +		}
    1.57 +		setParameterEntryInUse(LLNetworkData::PARAMS_LIGHT_IMAGE, FALSE, true);
    1.58 +		parameterChanged(LLNetworkData::PARAMS_LIGHT_IMAGE, true);
    1.59 +		mLightTexture = NULL;
    1.60  	}		
    1.61  }
    1.62  
     2.1 --- a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml	Tue May 01 16:43:38 2018 +0200
     2.2 +++ b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml	Tue May 01 16:45:50 2018 +0200
     2.3 @@ -4,7 +4,7 @@
     2.4  		Выборка [ITEM_COUNT] предметов и [CATEGORY_COUNT] папок ... [FILTER]
     2.5  	</panel.string>
     2.6  	<panel.string name="ItemcountCompleted">
     2.7 -		[ITEM_COUNT] предметов(а) и [CATEGORY_COUNT] папки(ок) ... [FILTER]
     2.8 +		[ITEM_COUNT] предметов(а) и [CATEGORY_COUNT] папки(ок) [FILTER]
     2.9  	</panel.string>
    2.10  	<panel.string name="ItemcountUnknown">
    2.11  		Выборка [ITEM_COUNT] предметов и [CATEGORY_COUNT] папок [FILTER]

mercurial