diff options
| author | Armin Weatherwax | 2009-07-01 23:22:56 +0200 |
|---|---|---|
| committer | Armin Weatherwax | 2009-07-11 13:43:22 +0200 |
| commit | 0b661f028e446ab4f19959129f3209f1a29fd63e (patch) | |
| tree | 2f1ab27163104727ed972ab55c0680b0a37a8637 /mAttachedObject.diff.txt | |
| parent | BROKEN logoff/relog crashing inconsistently on various startup states. (diff) | |
| download | meta-impy-0b661f028e446ab4f19959129f3209f1a29fd63e.zip meta-impy-0b661f028e446ab4f19959129f3209f1a29fd63e.tar.gz meta-impy-0b661f028e446ab4f19959129f3209f1a29fd63e.tar.bz2 meta-impy-0b661f028e446ab4f19959129f3209f1a29fd63e.tar.xz | |
BROKEN now consistantly crashes at startup STATE_PRECACHE
Diffstat (limited to 'mAttachedObject.diff.txt')
| -rw-r--r-- | mAttachedObject.diff.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/mAttachedObject.diff.txt b/mAttachedObject.diff.txt new file mode 100644 index 0000000..73ffab5 --- /dev/null +++ b/mAttachedObject.diff.txt | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | diff --git a/linden/indra/newview/llviewerjointattachment.h b/linden/indra/newview/llviewerjointattachment.h | ||
| 2 | index dd63bfd..6a505c0 100644 | ||
| 3 | --- a/linden/indra/newview/llviewerjointattachment.h | ||
| 4 | +++ b/linden/indra/newview/llviewerjointattachment.h | ||
| 5 | @@ -98,7 +98,9 @@ protected: | ||
| 6 | void calcLOD(); | ||
| 7 | |||
| 8 | protected: | ||
| 9 | - LLPointer<LLViewerObject> mAttachedObject; | ||
| 10 | + | ||
| 11 | + // Backlink only; don't make this an LLPointer. | ||
| 12 | + LLViewerObject* mAttachedObject; | ||
| 13 | BOOL mVisibleInFirst; | ||
| 14 | LLVector3 mOriginalPos; | ||
| 15 | S32 mGroup; | ||
| 16 | |||