diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-17 15:48:07 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-17 15:48:07 -0800 |
| commit | 61f3c1b41ddedc16f2026c62600475105621b305 (patch) | |
| tree | af2124f540a4ff55c08cec7038458e883747fe47 /indra/newview/llviewerobjectlist.cpp | |
| parent | 2d25eb18adc0c2c97c63a8e02f2274362672137c (diff) | |
| parent | c6a0f0ae1dec5ef2f7657d8c1ca07d85c1fef55d (diff) | |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 9e5c3f14f8..489c4107bb 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -1401,9 +1401,9 @@ void LLViewerObjectList::removeFromActiveList(LLViewerObject* objectp) mActiveObjects[idx]->setListIndex(idx); } - mActiveObjects.pop_back(); - } + mActiveObjects.pop_back(); } +} void LLViewerObjectList::updateActive(LLViewerObject *objectp) { |