diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-04-02 16:02:13 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-04-02 16:02:13 -0400 |
| commit | 323a2f2235a52383bcfbae79bdce9e61ca808d2a (patch) | |
| tree | 313d298add46edae3dadc1f3426b8fa68f9452fe /indra/newview/llvoavatarself.cpp | |
| parent | 557adcabb925acbcc79f39f76f7cb74b6202a8da (diff) | |
| parent | 49731dd21dec5fb8b6e5781940bab5f5fa9600a2 (diff) | |
pulling in sunshine-stable to sunshine-internal.
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rwxr-xr-x | indra/newview/llvoavatarself.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 878d4dd23d..0404884245 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -2566,7 +2566,7 @@ BOOL LLVOAvatarSelf::canGrabBakedTexture(EBakedTextureIndex baked_index) const } void LLVOAvatarSelf::addLocalTextureStats( ETextureIndex type, LLViewerFetchedTexture* imagep, - F32 texel_area_ratio, BOOL render_avatar, BOOL covered_by_baked, U32 index ) + F32 texel_area_ratio, BOOL render_avatar, BOOL covered_by_baked) { if (!isIndexLocalTexture(type)) return; @@ -2576,7 +2576,7 @@ void LLVOAvatarSelf::addLocalTextureStats( ETextureIndex type, LLViewerFetchedTe // textures failing to load issue. //if (!covered_by_baked) { - if (getLocalTextureID(type, index) != IMG_DEFAULT_AVATAR) + if (imagep->getID() != IMG_DEFAULT_AVATAR) { imagep->setNoDelete(); if (imagep->getDiscardLevel() != 0) @@ -2991,11 +2991,8 @@ void LLVOAvatarSelf::onCustomizeEnd(bool disable_camera_switch) gAgentCamera.changeCameraToDefault(); gAgentCamera.resetView(); } - - if (gAgent.getRegion() && gAgent.getRegion()->getCentralBakeVersion()) - { - LLAppearanceMgr::instance().requestServerAppearanceUpdate(); - } + + LLAppearanceMgr::instance().updateAppearanceFromCOF(); } } |