diff options
| author | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
| commit | e5124431b54d4342d4677371fccca5bc7250c079 (patch) | |
| tree | 8c9636e78e93cef6ed099d9abd72ec9ccbbf35fe /indra/newview/llpolymesh.h | |
| parent | ce5e13630cd8f4174549a3ec4ae8c24eec90bb3d (diff) | |
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/newview/llpolymesh.h')
| -rw-r--r-- | indra/newview/llpolymesh.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llpolymesh.h b/indra/newview/llpolymesh.h index 577f5c7dfb..1d09d6a1d3 100644 --- a/indra/newview/llpolymesh.h +++ b/indra/newview/llpolymesh.h @@ -340,7 +340,8 @@ protected: typedef LLAssocList<std::string, LLPolyMeshSharedData*> LLPolyMeshSharedDataTable; static LLPolyMeshSharedDataTable sGlobalSharedMeshList; - LLPointer<LLVOAvatar> mAvatarp; + // Backlink only; don't make this an LLPointer. + LLVOAvatar* mAvatarp; }; //----------------------------------------------------------------------------- @@ -406,7 +407,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 |