diff options
| author | Richard Linden <none@none> | 2013-01-09 23:46:33 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-09 23:46:33 -0800 |
| commit | beb431c7834f49d8e6b5304f7b60fb1f1b3b4afe (patch) | |
| tree | e268ef1a5116760093fe4f4e132c0e3c0a74ccdc /indra/newview/llvoavatarself.cpp | |
| parent | a891785f7a02098a53029311befd7083773d6ad8 (diff) | |
| parent | 0c3df70dffdc6b19abaa91bfd14f2d08a66e95dd (diff) | |
Automated merge with file:///d:%5Ccode%5Cviewer-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++) { |