diff options
| author | Richard Linden <none@none> | 2013-01-10 00:55:13 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-10 00:55:13 -0800 |
| commit | 6bf1e9f585fc945ee60501e69f75a12fd7d320cb (patch) | |
| tree | b8cf0e7024c8e77bcdda93ef11682f141b21a378 /indra/newview/llvoavatarself.cpp | |
| parent | 7b0762984a4c49595445ed3a5a113c3f0aa17181 (diff) | |
| parent | 2ac49344e1aea94a11ecdb07ac6043538246a2f6 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rwxr-xr-x | indra/newview/llvoavatarself.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 7c20e8eae7..cd033c84bf 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -808,8 +808,10 @@ U32 LLVOAvatarSelf::processUpdateMessage(LLMessageSystem *mesgsys, updateMeshTextures(); // unpack the texture UUIDs to the texture slots - retval = unpackTEMessage(mesgsys, _PREHASH_ObjectData, block_num); - + if(mesgsys != NULL) + { + retval = unpackTEMessage(mesgsys, _PREHASH_ObjectData, block_num); + } // need to trigger a few operations to get the avatar to use the new bakes for (U32 i = 0; i < mBakedTextureDatas.size(); i++) { |