Merge tag '7.1.7-release'

source for viewer 7.1.7.8974243247

1 files changed, 29 insertions, 29 deletions

diff --git a/indra/newview/llaccountingcostmanager.h b/indra/newview/llaccountingcostmanager.h
index d133c6437b..1883a709a1 100644
--- a/indra/newview/llaccountingcostmanager.h
+++ b/indra/newview/llaccountingcostmanager.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lllAccountingQuotaManager.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$
  */
@@ -36,41 +36,41 @@
 class LLAccountingCostObserver
 {
 public:
-	LLAccountingCostObserver() { mObserverHandle.bind(this); }
-	virtual ~LLAccountingCostObserver() {}
-	virtual void onWeightsUpdate(const SelectionCost& selection_cost) = 0;
-	virtual void setErrorStatus(S32 status, const std::string& reason) = 0;
-	const LLHandle<LLAccountingCostObserver>& getObserverHandle() const { return mObserverHandle; }
-	const LLUUID& getTransactionID() { return mTransactionID; }
+    LLAccountingCostObserver() { mObserverHandle.bind(this); }
+    virtual ~LLAccountingCostObserver() {}
+    virtual void onWeightsUpdate(const SelectionCost& selection_cost) = 0;
+    virtual void setErrorStatus(S32 status, const std::string& reason) = 0;
+    const LLHandle<LLAccountingCostObserver>& getObserverHandle() const { return mObserverHandle; }
+    const LLUUID& getTransactionID() { return mTransactionID; }
 
 protected:
-	virtual void generateTransactionID() = 0;
+    virtual void generateTransactionID() = 0;
 
-	LLRootHandle<LLAccountingCostObserver> mObserverHandle;
-	LLUUID		mTransactionID;
+    LLRootHandle<LLAccountingCostObserver> mObserverHandle;
+    LLUUID      mTransactionID;
 };
 //===============================================================================
 class LLAccountingCostManager : public LLSingleton<LLAccountingCostManager>
 {
-	LLSINGLETON(LLAccountingCostManager);
+    LLSINGLETON(LLAccountingCostManager);
 
 public:
-	//Store an object that will be eventually fetched
-	void addObject( const LLUUID& objectID );
-	//Request quotas for object list
-	void fetchCosts( eSelectionType selectionType, const std::string& url,
-			const LLHandle<LLAccountingCostObserver>& observer_handle );
-	//Delete a specific object from the pending list
-	void removePendingObject( const LLUUID& objectID );
-	
+    //Store an object that will be eventually fetched
+    void addObject( const LLUUID& objectID );
+    //Request quotas for object list
+    void fetchCosts( eSelectionType selectionType, const std::string& url,
+            const LLHandle<LLAccountingCostObserver>& observer_handle );
+    //Delete a specific object from the pending list
+    void removePendingObject( const LLUUID& objectID );
+
 private:
-	//Set of objects that will be used to generate a cost
-	uuid_set_t mObjectList;
-	//During fetchCosts we move object into a the pending set to signify that 
-	//a fetch has been instigated.
-	uuid_set_t mPendingObjectQuota;
+    //Set of objects that will be used to generate a cost
+    uuid_set_t mObjectList;
+    //During fetchCosts we move object into a the pending set to signify that
+    //a fetch has been instigated.
+    uuid_set_t mPendingObjectQuota;
 
-    void accountingCostCoro(std::string url, eSelectionType selectionType, const LLHandle<LLAccountingCostObserver> observerHandle);
+    static void accountingCostCoro(std::string url, eSelectionType selectionType, const LLHandle<LLAccountingCostObserver> observerHandle);
 
 };
 //===============================================================================