diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-11-21 01:18:39 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-11-21 01:18:39 +0000 |
| commit | ac68eb16a2dac453fe85b7218297f561b8fc96ca (patch) | |
| tree | a1e26d95326b610c6d2a740ee80071bfb866d8e9 /indra/newview/llviewerobjectlist.cpp | |
| parent | 77c108b2c4879fbbb168f91fed7763a0b557ecab (diff) | |
Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. 101837 to 103519
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index ab06a0f4fb..1fca77ec50 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -903,7 +903,7 @@ void LLViewerObjectList::killAllObjects() if (!mMapObjects.empty()) { llwarns << "Some objects still on map object list!" << llendl; - mActiveObjects.clear(); + mMapObjects.clear(); } } |