Merge commit 'e7eced3' into lua-timers for whitespace fixes.

1 files changed, 20 insertions, 20 deletions

diff --git a/indra/newview/llaccountingcost.h b/indra/newview/llaccountingcost.h
index bc770fe1d2..d28ff48131 100644
--- a/indra/newview/llaccountingcost.h
+++ b/indra/newview/llaccountingcost.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llaccountingcost.h
  * @
  *
  * $LicenseInfo:firstyear=2001&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2011, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -30,21 +30,21 @@
 //SelectionQuota atm does not require a id
 struct SelectionCost
 {
-	SelectionCost( /*LLTransactionID transactionId, */ F32 physicsCost, F32 networkCost, F32 simulationCost )
-	//: mTransactionId( transactionId)
-	: mPhysicsCost( physicsCost )
-	, mNetworkCost( networkCost )
-	, mSimulationCost( simulationCost )
-	{
-	}
-	SelectionCost()
-	: mPhysicsCost( 0.0f )
-	, mNetworkCost( 0.0f )
-	, mSimulationCost( 0.0f )
-	{}
-	
-	F32 mPhysicsCost, mNetworkCost, mSimulationCost;	
-	//LLTransactionID mTransactionId;
+    SelectionCost( /*LLTransactionID transactionId, */ F32 physicsCost, F32 networkCost, F32 simulationCost )
+    //: mTransactionId( transactionId)
+    : mPhysicsCost( physicsCost )
+    , mNetworkCost( networkCost )
+    , mSimulationCost( simulationCost )
+    {
+    }
+    SelectionCost()
+    : mPhysicsCost( 0.0f )
+    , mNetworkCost( 0.0f )
+    , mSimulationCost( 0.0f )
+    {}
+
+    F32 mPhysicsCost, mNetworkCost, mSimulationCost;
+    //LLTransactionID mTransactionId;
 };
 
 typedef enum { Roots = 0 , Prims } eSelectionType;