diff options
| author | Richard Linden <none@none> | 2013-01-11 13:15:39 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-11 13:15:39 -0800 |
| commit | a3d07fd4c27e527edfb901b25b5857d3fd7d2eaf (patch) | |
| tree | 306b27137fe029cafe4d65f0c24fc65820e1ab9a /indra/newview/llvoavatarself.cpp | |
| parent | dd54893bcf50f41e5c678b6ca67b646284b94fca (diff) | |
| parent | 17c051f965e05a8a91d4a93b641084869897fe71 (diff) | |
Automated merge with file:///c:%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++) { |