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/lldriverparam.h | |
parent | ce5e13630cd8f4174549a3ec4ae8c24eec90bb3d (diff) |
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/newview/lldriverparam.h')
-rw-r--r-- | indra/newview/lldriverparam.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lldriverparam.h b/indra/newview/lldriverparam.h index 8cdaa893c8..ccd64ab6c8 100644 --- a/indra/newview/lldriverparam.h +++ b/indra/newview/lldriverparam.h @@ -84,7 +84,8 @@ protected: typedef std::vector<LLDrivenEntry> entry_list_t; entry_list_t mDriven; LLViewerVisualParam* mCurrentDistortionParam; - LLPointer<LLVOAvatar> mAvatarp; + // Backlink only; don't make this an LLPointer. + LLVOAvatar* mAvatarp; }; #endif // LL_LLDRIVERPARAM_H |