diff options
| author | McCabe Maxsted | 2010-08-27 06:41:14 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-27 06:41:14 -0700 |
| commit | 5ea3583bed34410758b54dad5aab9dcdb550719f (patch) | |
| tree | db52fa3a85adfc393b00d421a1cd109398fa82ba /linden/indra/newview | |
| parent | Fixed object scale not working at 5 decimal places (still needs fixing for po... (diff) | |
| download | meta-impy-5ea3583bed34410758b54dad5aab9dcdb550719f.zip meta-impy-5ea3583bed34410758b54dad5aab9dcdb550719f.tar.gz meta-impy-5ea3583bed34410758b54dad5aab9dcdb550719f.tar.bz2 meta-impy-5ea3583bed34410758b54dad5aab9dcdb550719f.tar.xz | |
Revert "Fix for objects surviving kill region, ported from Emerald." since it causes issues with region loading.
This reverts commit 388da31d1cdb08a25ad8ad522c7e977452ae33d6.
Diffstat (limited to 'linden/indra/newview')
| -rw-r--r-- | linden/indra/newview/llviewerobjectlist.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp index b30c28c..bfb248b 100644 --- a/linden/indra/newview/llviewerobjectlist.cpp +++ b/linden/indra/newview/llviewerobjectlist.cpp | |||
| @@ -900,9 +900,6 @@ 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; | ||
| 906 | } | 903 | } |
| 907 | } | 904 | } |
| 908 | 905 | ||