Skip to content
Snippets Groups Projects
Commit 658a30bd authored by David Parks's avatar David Parks
Browse files

SL-16907 Potential fix for crash in updateSkinInfoMatrixPalette

parent 85e48061
Branches
Tags
1 merge request!83Merge Linden 6.6.7
...@@ -795,7 +795,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, bool depth_only, bool rigged) ...@@ -795,7 +795,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, bool depth_only, bool rigged)
bool LLDrawPoolAlpha::uploadMatrixPalette(const LLDrawInfo& params) bool LLDrawPoolAlpha::uploadMatrixPalette(const LLDrawInfo& params)
{ {
const LLVOAvatar::MatrixPaletteCache& mpc = params.mAvatar->updateSkinInfoMatrixPalette(params.mSkinInfo); const LLVOAvatar::MatrixPaletteCache& mpc = params.mAvatar.get()->updateSkinInfoMatrixPalette(params.mSkinInfo);
U32 count = mpc.mMatrixPalette.size(); U32 count = mpc.mMatrixPalette.size();
if (count == 0) if (count == 0)
......
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
#include "llface.h" #include "llface.h"
#include "llviewercamera.h" #include "llviewercamera.h"
#include "llvector4a.h" #include "llvector4a.h"
#include "llvoavatar.h"
#include <queue> #include <queue>
#include <unordered_map> #include <unordered_map>
...@@ -125,7 +127,7 @@ class LLDrawInfo : public LLRefCount ...@@ -125,7 +127,7 @@ class LLDrawInfo : public LLRefCount
F32 mAlphaMaskCutoff; F32 mAlphaMaskCutoff;
U8 mDiffuseAlphaMode; U8 mDiffuseAlphaMode;
bool mSelected; bool mSelected;
LLVOAvatar* mAvatar = nullptr; LLPointer<LLVOAvatar> mAvatar = nullptr;
LLMeshSkinInfo* mSkinInfo = nullptr; LLMeshSkinInfo* mSkinInfo = nullptr;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment