Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting

2 files changed, 52 insertions, 52 deletions

diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp
index 158fc4b0a9..926d791d1f 100644
--- a/indra/newview/llvieweroctree.cpp
+++ b/indra/newview/llvieweroctree.cpp
@@ -799,46 +799,46 @@ void LLViewerOctreeCull::visit(const OctreeNode* branch)
 	}
 }
 
-//--------------------------------------------------------------

-//class LLViewerOctreeDebug

-//virtual 

-void LLViewerOctreeDebug::visit(const OctreeNode* branch)

-{

-#if 0

-	llinfos << "Node: " << (U32)branch << " # Elements: " << branch->getElementCount() << " # Children: " << branch->getChildCount() << llendl;

-	for (U32 i = 0; i < branch->getChildCount(); i++)

-	{

-		llinfos << "Child " << i << " : " << (U32)branch->getChild(i) << llendl;

-	}

-#endif

-	LLviewerOctreeGroup* group = (LLviewerOctreeGroup*) branch->getListener(0);

-	processGroup(group);	

-}

-

-//virtual 

-void LLViewerOctreeDebug::processGroup(LLviewerOctreeGroup* group)

-{

-#if 0

-	const LLVector4a* vec4 = group->getBounds();

-	LLVector3 vec[2];

-	vec[0].set(vec4[0].getF32ptr());

-	vec[1].set(vec4[1].getF32ptr());

-	llinfos << "Bounds: " << vec[0] << " : " << vec[1] << llendl;

-

-	vec4 = group->getExtents();

-	vec[0].set(vec4[0].getF32ptr());

-	vec[1].set(vec4[1].getF32ptr());

-	llinfos << "Extents: " << vec[0] << " : " << vec[1] << llendl;

-

-	vec4 = group->getObjectBounds();

-	vec[0].set(vec4[0].getF32ptr());

-	vec[1].set(vec4[1].getF32ptr());

-	llinfos << "ObjectBounds: " << vec[0] << " : " << vec[1] << llendl;

-

-	vec4 = group->getObjectExtents();

-	vec[0].set(vec4[0].getF32ptr());

-	vec[1].set(vec4[1].getF32ptr());

-	llinfos << "ObjectExtents: " << vec[0] << " : " << vec[1] << llendl;

-#endif

-}

-//--------------------------------------------------------------

+//--------------------------------------------------------------
+//class LLViewerOctreeDebug
+//virtual 
+void LLViewerOctreeDebug::visit(const OctreeNode* branch)
+{
+#if 0
+	llinfos << "Node: " << (U32)branch << " # Elements: " << branch->getElementCount() << " # Children: " << branch->getChildCount() << llendl;
+	for (U32 i = 0; i < branch->getChildCount(); i++)
+	{
+		llinfos << "Child " << i << " : " << (U32)branch->getChild(i) << llendl;
+	}
+#endif
+	LLviewerOctreeGroup* group = (LLviewerOctreeGroup*) branch->getListener(0);
+	processGroup(group);	
+}
+
+//virtual 
+void LLViewerOctreeDebug::processGroup(LLviewerOctreeGroup* group)
+{
+#if 0
+	const LLVector4a* vec4 = group->getBounds();
+	LLVector3 vec[2];
+	vec[0].set(vec4[0].getF32ptr());
+	vec[1].set(vec4[1].getF32ptr());
+	llinfos << "Bounds: " << vec[0] << " : " << vec[1] << llendl;
+
+	vec4 = group->getExtents();
+	vec[0].set(vec4[0].getF32ptr());
+	vec[1].set(vec4[1].getF32ptr());
+	llinfos << "Extents: " << vec[0] << " : " << vec[1] << llendl;
+
+	vec4 = group->getObjectBounds();
+	vec[0].set(vec4[0].getF32ptr());
+	vec[1].set(vec4[1].getF32ptr());
+	llinfos << "ObjectBounds: " << vec[0] << " : " << vec[1] << llendl;
+
+	vec4 = group->getObjectExtents();
+	vec[0].set(vec4[0].getF32ptr());
+	vec[1].set(vec4[1].getF32ptr());
+	llinfos << "ObjectExtents: " << vec[0] << " : " << vec[1] << llendl;
+#endif
+}
+//--------------------------------------------------------------
diff --git a/indra/newview/llvieweroctree.h b/indra/newview/llvieweroctree.h
index 21cc934d77..b6faf4c7ba 100644
--- a/indra/newview/llvieweroctree.h
+++ b/indra/newview/llvieweroctree.h
@@ -324,15 +324,15 @@ protected:
 	S32 mRes;
 };
 
-//scan the octree, output the info of each node for debug use.

-class LLViewerOctreeDebug : public OctreeTraveler

-{

-public:

-	virtual void processGroup(LLviewerOctreeGroup* group);

-	virtual void visit(const OctreeNode* branch);

-

-public:

-	static BOOL sInDebug;

+//scan the octree, output the info of each node for debug use.
+class LLViewerOctreeDebug : public OctreeTraveler
+{
+public:
+	virtual void processGroup(LLviewerOctreeGroup* group);
+	virtual void visit(const OctreeNode* branch);
+
+public:
+	static BOOL sInDebug;
 };
 
 #endif