1 files changed, 4 insertions, 2 deletions

diff --git a/linden/indra/newview/llpolymesh.h b/linden/indra/newview/llpolymesh.h
index 9634dbf..a421e05 100644
--- a/linden/indra/newview/llpolymesh.h
+++ b/linden/indra/newview/llpolymesh.h
@@ -360,7 +360,8 @@ protected:
         typedef LLAssocList<std::string, LLPolyMeshSharedData*> LLPolyMeshSharedDataTable; 
         static LLPolyMeshSharedDataTable sGlobalSharedMeshList;
 
-        LLPointer<LLVOAvatar> mAvatarp;
+        // Backlink only; don't make this an LLPointer.
+        LLVOAvatar* mAvatarp;
 };
 
 //-----------------------------------------------------------------------------
@@ -426,7 +427,8 @@ protected:
         joint_vec_map_t mJointScales;
         joint_vec_map_t mJointOffsets;
         LLVector3       mDefaultVec;
-        LLPointer<LLVOAvatar> mAvatar;
+        // Backlink only; don't make this an LLPointer.
+        LLVOAvatar *mAvatar;
 };
 
 #endif // LL_LLPOLYMESH_H