diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-12 12:58:28 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-12 12:58:28 -0800 |
| commit | 0e6139eb3d3af1e77df20f87deef427993bf2c61 (patch) | |
| tree | 2c93f9a8d69f28cec99393b3cacbab85a8aa073d /indra/newview/llviewerobjectlist.cpp | |
| parent | 6f53b5baeb9e04c20c8fe6f419e09c9604a56497 (diff) | |
| parent | 7833ecb58094641d3cd79c6772ad6c9fd4799f92 (diff) | |
merging in latest changes
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) { |