diff options
author | Jacek Antonelli | 2008-08-15 23:45:01 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:01 -0500 |
commit | 28d8d4e7664bcd6c8369cc18832e42096af7cad2 (patch) | |
tree | 069020fe66339aff2ca4176370ff743b14713f2d /linden/indra/newview/llpolymesh.h | |
parent | Second Life viewer sources 1.17.2.0 (diff) | |
download | meta-impy-28d8d4e7664bcd6c8369cc18832e42096af7cad2.zip meta-impy-28d8d4e7664bcd6c8369cc18832e42096af7cad2.tar.gz meta-impy-28d8d4e7664bcd6c8369cc18832e42096af7cad2.tar.bz2 meta-impy-28d8d4e7664bcd6c8369cc18832e42096af7cad2.tar.xz |
Second Life viewer sources 1.17.3.0
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llpolymesh.h | 6 |
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: | |||
360 | typedef LLAssocList<std::string, LLPolyMeshSharedData*> LLPolyMeshSharedDataTable; | 360 | typedef LLAssocList<std::string, LLPolyMeshSharedData*> LLPolyMeshSharedDataTable; |
361 | static LLPolyMeshSharedDataTable sGlobalSharedMeshList; | 361 | static LLPolyMeshSharedDataTable sGlobalSharedMeshList; |
362 | 362 | ||
363 | LLPointer<LLVOAvatar> mAvatarp; | 363 | // Backlink only; don't make this an LLPointer. |
364 | LLVOAvatar* mAvatarp; | ||
364 | }; | 365 | }; |
365 | 366 | ||
366 | //----------------------------------------------------------------------------- | 367 | //----------------------------------------------------------------------------- |
@@ -426,7 +427,8 @@ protected: | |||
426 | joint_vec_map_t mJointScales; | 427 | joint_vec_map_t mJointScales; |
427 | joint_vec_map_t mJointOffsets; | 428 | joint_vec_map_t mJointOffsets; |
428 | LLVector3 mDefaultVec; | 429 | LLVector3 mDefaultVec; |
429 | LLPointer<LLVOAvatar> mAvatar; | 430 | // Backlink only; don't make this an LLPointer. |
431 | LLVOAvatar *mAvatar; | ||
430 | }; | 432 | }; |
431 | 433 | ||
432 | #endif // LL_LLPOLYMESH_H | 434 | #endif // LL_LLPOLYMESH_H |