diff options
| author | Richard Linden <none@none> | 2013-06-21 11:00:47 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-21 11:00:47 -0700 |
| commit | 090fa057b5ff17170d846473a2bc9ebc315c99d3 (patch) | |
| tree | 781dff230ab8d1fc651e453cdd568df5aff8487a /indra/newview/llvoavatarself.cpp | |
| parent | 5de2f0a8970244866dc8b511caa3c8626955264f (diff) | |
| parent | a2a6bf20d71f923e9a5e43f71213fffbfea5a2a6 (diff) | |
merge
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rwxr-xr-x | indra/newview/llvoavatarself.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 9ab910f7fd..7d99b11360 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -792,7 +792,7 @@ U32 LLVOAvatarSelf::processUpdateMessage(LLMessageSystem *mesgsys, // unpack the texture UUIDs to the texture slots if(mesgsys != NULL) { - retval = unpackTEMessage(mesgsys, _PREHASH_ObjectData, (S32) block_num); + retval = unpackTEMessage(mesgsys, _PREHASH_ObjectData, (S32) block_num); } // need to trigger a few operations to get the avatar to use the new bakes @@ -2584,7 +2584,7 @@ void LLVOAvatarSelf::addLocalTextureStats( ETextureIndex type, LLViewerFetchedTe { F32 desired_pixels; desired_pixels = llmin(mPixelArea, (F32)getTexImageArea()); - + imagep->setBoostLevel(getAvatarBoostLevel()); imagep->setAdditionalDecodePriority(SELF_ADDITIONAL_PRI) ; imagep->resetTextureStats(); |