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

[MAINT-8846] - fixing duplicate id in avatar_lad.xml fixrs character test female crash. code cleanup.

master
Anchor Linden 2018-07-15 21:33:02 +05:30
parent 917ab7be9e
commit dcbf57ab2d
4 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llappearance/llavatarappearance.cpp
View File

@ -1491,9 +1491,9 @@ BOOL LLAvatarAppearance::teToColorParams( ETextureIndex te, U32 *param_name )
case TEX_AUX1_TATTOO:
case TEX_AUX2_TATTOO:
case TEX_AUX3_TATTOO:
param_name[0] = 1029; //"tattoo_universal_red";
param_name[1] = 1030; //"tattoo_universal_green";
param_name[2] = 1031; //"tattoo_universal_blue";
param_name[0] = 1238; //"tattoo_universal_red";
param_name[1] = 1239; //"tattoo_universal_green";
param_name[2] = 1240; //"tattoo_universal_blue";
break;
default:

6
indra/newview/character/avatar_lad.xml
View File

@ -16633,7 +16633,7 @@ render_pass="bump">
</param>
<param
id="1029"
id="1238"
group="2"
wearable="universal"
edit_group="colorpicker"
@ -16723,7 +16723,7 @@ render_pass="bump">
</param>
<param
id="1030"
id="1239"
group="2"
wearable="universal"
edit_group="colorpicker"
@ -16813,7 +16813,7 @@ render_pass="bump">
</param>
<param
id="1031"
id="1240"
group="2"
wearable="universal"
edit_group="colorpicker"

19
indra/newview/lltexturectrl.cpp
View File

@ -71,6 +71,8 @@
#include "lllocalbitmaps.h"
#include "llerror.h"
#include "llavatarappearancedefines.h"
static const F32 CONTEXT_CONE_IN_ALPHA = 0.0f;
static const F32 CONTEXT_CONE_OUT_ALPHA = 1.f;
static const F32 CONTEXT_FADE_TIME = 0.08f;
@ -81,13 +83,6 @@ static const S32 LOCAL_TRACKING_ID_COLUMN = 1;
//static const char WHITE_IMAGE_NAME[] = "Blank Texture";
//static const char NO_IMAGE_NAME[] = "None";
static BOOL isBakedImageID(LLUUID mImageAssetID)
{
return ((mImageAssetID == IMG_USE_BAKED_EYES) || (mImageAssetID == IMG_USE_BAKED_HAIR) || (mImageAssetID == IMG_USE_BAKED_HEAD) || (mImageAssetID == IMG_USE_BAKED_LOWER) || (mImageAssetID == IMG_USE_BAKED_SKIRT) || (mImageAssetID == IMG_USE_BAKED_UPPER)
|| (mImageAssetID == IMG_USE_BAKED_LEFTARM) || (mImageAssetID == IMG_USE_BAKED_LEFTLEG) || (mImageAssetID == IMG_USE_BAKED_AUX1) || (mImageAssetID == IMG_USE_BAKED_AUX2) || (mImageAssetID == IMG_USE_BAKED_AUX3));
}
LLFloaterTexturePicker::LLFloaterTexturePicker(
LLView* owner,
LLUUID image_asset_id,
@ -146,7 +141,7 @@ void LLFloaterTexturePicker::setImageID(const LLUUID& image_id, bool set_selecti
mViewModel->setDirty(); // *TODO: shouldn't we be using setValue() here?
mImageAssetID = image_id;
if (isBakedImageID(mImageAssetID))
if (LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(mImageAssetID))
{
if ( mBakeTextureEnabled && mModeSelector->getSelectedIndex() != 2)
{
@ -517,8 +512,7 @@ void LLFloaterTexturePicker::draw()
{
LLPointer<LLViewerFetchedTexture> texture = NULL;
if ((mImageAssetID == IMG_USE_BAKED_EYES) || (mImageAssetID == IMG_USE_BAKED_HAIR) || (mImageAssetID == IMG_USE_BAKED_HEAD) || (mImageAssetID == IMG_USE_BAKED_LOWER) || (mImageAssetID == IMG_USE_BAKED_SKIRT) || (mImageAssetID == IMG_USE_BAKED_UPPER)
|| (mImageAssetID == IMG_USE_BAKED_LEFTARM) || (mImageAssetID == IMG_USE_BAKED_LEFTLEG) || (mImageAssetID == IMG_USE_BAKED_AUX1) || (mImageAssetID == IMG_USE_BAKED_AUX2) || (mImageAssetID == IMG_USE_BAKED_AUX3))
if (LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(mImageAssetID))
{
LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
if (obj)
@ -1157,7 +1151,7 @@ void LLFloaterTexturePicker::setBakeTextureEnabled(BOOL enabled)
mModeSelector->setSelectedIndex(0, 0);
}
if (changed && mBakeTextureEnabled && isBakedImageID(mImageAssetID))
if (changed && mBakeTextureEnabled && LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(mImageAssetID))
{
if (mModeSelector->getSelectedIndex() != 2)
{
@ -1654,8 +1648,7 @@ void LLTextureCtrl::draw()
{
LLPointer<LLViewerFetchedTexture> texture = NULL;
if ((mImageAssetID == IMG_USE_BAKED_EYES) || (mImageAssetID == IMG_USE_BAKED_HAIR) || (mImageAssetID == IMG_USE_BAKED_HEAD) || (mImageAssetID == IMG_USE_BAKED_LOWER) || (mImageAssetID == IMG_USE_BAKED_SKIRT) || (mImageAssetID == IMG_USE_BAKED_UPPER)
|| (mImageAssetID == IMG_USE_BAKED_LEFTARM) || (mImageAssetID == IMG_USE_BAKED_LEFTLEG) || (mImageAssetID == IMG_USE_BAKED_AUX1) || (mImageAssetID == IMG_USE_BAKED_AUX2) || (mImageAssetID == IMG_USE_BAKED_AUX3))
if (LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(mImageAssetID))
{
LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
if (obj)

1
indra/newview/llviewerobject.cpp
View File

@ -4408,7 +4408,6 @@ LLViewerTexture* LLViewerObject::getBakedTextureForMagicId(const LLUUID& id)
return LLViewerTextureManager::getFetchedTexture(id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
}
return NULL;
}
void LLViewerObject::updateAvatarMeshVisibility(const LLUUID& id, const LLUUID& old_id)