diff options
| author | Richard Linden <none@none> | 2014-02-06 11:27:16 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-02-06 11:27:16 -0800 |
| commit | 3040b429a3b136b87ddb0ae88ccfa3a7aa71e232 (patch) | |
| tree | 46bf70fda640f925c21d519a41a0d7ebd94c56a0 /indra/newview | |
| parent | 2ab11c8e34f2349500aef76cd8372ca889020728 (diff) | |
added LL_TRACE_ENABLED to allow disabling of lltrace
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvieweroctree.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp index 12a1e98075..03c3f0fc08 100644 --- a/indra/newview/llvieweroctree.cpp +++ b/indra/newview/llvieweroctree.cpp @@ -300,9 +300,9 @@ void LLViewerOctreeEntry::setGroup(LLViewerOctreeGroup* group) if(mGroup) { - LLViewerOctreeGroup* group = mGroup; + LLViewerOctreeGroup* old_group = mGroup; mGroup = NULL; - group->removeFromGroup(this); + old_group->removeFromGroup(this); llassert(mBinIndex == -1); } |