diff options
| author | Jacek Antonelli | 2008-09-17 16:25:39 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-09-17 16:25:39 -0500 |
| commit | 6d4a0275275b1af795c77c629d5ca1a7871aa234 (patch) | |
| tree | 5b30dc59707e8548b8b1e02c84615a9b0afd6c9f /linden/indra | |
| parent | Merge branch 'VWR-3877-b' into nicholaz-patches (diff) | |
| parent | VWR-2685: Possible crash in bounding box (getBoundingBoxAgent()) (diff) | |
| download | meta-impy-6d4a0275275b1af795c77c629d5ca1a7871aa234.zip meta-impy-6d4a0275275b1af795c77c629d5ca1a7871aa234.tar.gz meta-impy-6d4a0275275b1af795c77c629d5ca1a7871aa234.tar.bz2 meta-impy-6d4a0275275b1af795c77c629d5ca1a7871aa234.tar.xz | |
Merge branch 'VWR-2685' into nicholaz-patches
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/newview/llviewerjointattachment.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewerjointattachment.h b/linden/indra/newview/llviewerjointattachment.h index 8e665aa..a69c10c 100644 --- a/linden/indra/newview/llviewerjointattachment.h +++ b/linden/indra/newview/llviewerjointattachment.h | |||
| @@ -98,8 +98,7 @@ protected: | |||
| 98 | void calcLOD(); | 98 | void calcLOD(); |
| 99 | 99 | ||
| 100 | protected: | 100 | protected: |
| 101 | // Backlink only; don't make this an LLPointer. | 101 | LLPointer<LLViewerObject> mAttachedObject; |
| 102 | LLViewerObject* mAttachedObject; | ||
| 103 | BOOL mVisibleInFirst; | 102 | BOOL mVisibleInFirst; |
| 104 | LLVector3 mOriginalPos; | 103 | LLVector3 mOriginalPos; |
| 105 | S32 mGroup; | 104 | S32 mGroup; |