From 3040b429a3b136b87ddb0ae88ccfa3a7aa71e232 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 6 Feb 2014 11:27:16 -0800
Subject: added LL_TRACE_ENABLED to allow disabling of lltrace

---
 indra/newview/llvieweroctree.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

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);
 	}
-- 
cgit v1.2.3