diff options
| author | McCabe Maxsted | 2010-06-21 18:32:54 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2010-06-26 19:01:31 -0500 |
| commit | 388da31d1cdb08a25ad8ad522c7e977452ae33d6 (patch) | |
| tree | d7fe84191ac177b835d5cefbfc4af8dcd8df40b8 /linden/indra/newview/llviewerobjectlist.cpp | |
| parent | Fix for the chatlog loading/saving bad filenames, ported from Emerald. (diff) | |
| download | meta-impy-388da31d1cdb08a25ad8ad522c7e977452ae33d6.zip meta-impy-388da31d1cdb08a25ad8ad522c7e977452ae33d6.tar.gz meta-impy-388da31d1cdb08a25ad8ad522c7e977452ae33d6.tar.bz2 meta-impy-388da31d1cdb08a25ad8ad522c7e977452ae33d6.tar.xz | |
Fix for objects surviving kill region, ported from Emerald.
Diffstat (limited to 'linden/indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | linden/indra/newview/llviewerobjectlist.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp index bfb248b..b30c28c 100644 --- a/linden/indra/newview/llviewerobjectlist.cpp +++ b/linden/indra/newview/llviewerobjectlist.cpp | |||
| @@ -900,6 +900,9 @@ void LLViewerObjectList::killObjects(LLViewerRegion *regionp) | |||
| 900 | if (objectp->mRegionp == regionp) | 900 | if (objectp->mRegionp == regionp) |
| 901 | { | 901 | { |
| 902 | killObject(objectp); | 902 | killObject(objectp); |
| 903 | // invalidate region pointer. region will become invalid, but | ||
| 904 | // refcounted objects may survive the cleanDeadObjects() call below | ||
| 905 | objectp->mRegionp = NULL; | ||
| 903 | } | 906 | } |
| 904 | } | 907 | } |
| 905 | 908 | ||