From 9c1c791b29cb5087ebff142d4ad7a55b65be0ad0 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 17 Mar 2011 17:35:51 -0500
Subject: Merge indentation fix up.

---
 indra/newview/llfloatermodelpreview.cpp | 34 ++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 7d60258ca4..ce977b33bb 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -1315,25 +1315,25 @@ bool LLModelLoader::doLoadModel()
 						bool missingSkeletonOrScene = false;
 						
 						//If no skeleton, do a breadth-first search to get at specific joints
-							bool rootNode = false;
-							bool skeletonWithNoRootNode = false;
-							
-							//Need to test for a skeleton that does not have a root node
-							//This occurs when your instance controller does not have an associated scene 
-							if ( pSkeleton )
+						bool rootNode = false;
+						bool skeletonWithNoRootNode = false;
+						
+						//Need to test for a skeleton that does not have a root node
+						//This occurs when your instance controller does not have an associated scene 
+						if ( pSkeleton )
+						{
+							daeElement* pSkeletonRootNode = pSkeleton->getValue().getElement();
+							if ( pSkeletonRootNode )
 							{
-								daeElement* pSkeletonRootNode = pSkeleton->getValue().getElement();
-								if ( pSkeletonRootNode )
-								{
-									rootNode = true;
-								}
-								else 
-								{
-									skeletonWithNoRootNode = true;
-								}
-
+								rootNode = true;
 							}
-							if ( !pSkeleton || !rootNode )
+							else 
+							{
+								skeletonWithNoRootNode = true;
+							}
+
+						}
+						if ( !pSkeleton || !rootNode )
 						{
 							daeElement* pScene = root->getDescendant("visual_scene");
 							if ( !pScene )
-- 
cgit v1.2.3