SH-1252 and SH-1253 WIP.

14 files changed, 459 insertions, 5 deletions

diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 80df91a5c1..9910281b64 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -115,6 +115,7 @@ set(llcommon_HEADER_FILES
     indra_constants.h
     linden_common.h
     linked_lists.h
+    llaccountingquota.h
     llallocator.h
     llallocator_heap_profile.h
     llagentconstants.h
diff --git a/indra/llcommon/llaccountingquota.h b/indra/llcommon/llaccountingquota.h
new file mode 100644
index 0000000000..f52d94f868
--- /dev/null
+++ b/indra/llcommon/llaccountingquota.h
@@ -0,0 +1,78 @@
+/** 
+ * @file llaccountingquota.h
+ * @
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_ACCOUNTINGQUOTA_H
+#define LL_ACCOUNTINGQUOTA_H
+
+struct ParcelQuota
+{
+	ParcelQuota( F32 ownerRenderCost, F32 ownerPhysicsCost, F32 ownerNetworkCost, F32 ownerSimulationCost,
+				F32 groupRenderCost, F32 groupPhysicsCost, F32 groupNetworkCost, F32 groupSimulationCost,
+				F32 otherRenderCost, F32 otherPhysicsCost, F32 otherNetworkCost, F32 otherSimulationCost,
+				F32 totalRenderCost, F32 totalPhysicsCost, F32 totalNetworkCost, F32 totalSimulationCost)
+	: mOwnerRenderCost( ownerRenderCost ), mOwnerPhysicsCost( ownerPhysicsCost ) 
+	, mOwnerNetworkCost( ownerNetworkCost ), mOwnerSimulationCost( ownerSimulationCost )
+	, mGroupRenderCost( groupRenderCost ), mGroupPhysicsCost( groupPhysicsCost )
+	, mGroupNetworkCost( groupNetworkCost ), mGroupSimulationCost( groupSimulationCost )
+	, mOtherRenderCost( otherRenderCost ), mOtherPhysicsCost( otherPhysicsCost )
+	, mOtherNetworkCost( otherNetworkCost ), mOtherSimulationCost( otherSimulationCost )
+	, mTotalRenderCost( totalRenderCost ), mTotalPhysicsCost( totalPhysicsCost ) 
+	, mTotalNetworkCost( totalNetworkCost ), mTotalSimulationCost( totalSimulationCost )
+	{
+	}
+	ParcelQuota(){}			
+	F32 mOwnerRenderCost, mOwnerPhysicsCost, mOwnerNetworkCost, mOwnerSimulationCost;
+	F32 mGroupRenderCost, mGroupPhysicsCost, mGroupNetworkCost, mGroupSimulationCost;
+	F32 mOtherRenderCost, mOtherPhysicsCost, mOtherNetworkCost, mOtherSimulationCost;
+	F32 mTotalRenderCost, mTotalPhysicsCost, mTotalNetworkCost, mTotalSimulationCost;
+};
+
+struct SelectionQuota
+{
+	SelectionQuota( S32 localId, F32 renderCost, F32 physicsCost, F32 networkCost, F32 simulationCost )
+	: mLocalId( localId)
+	, mRenderCost( renderCost )
+	, mPhysicsCost( physicsCost )
+	, mNetworkCost( networkCost )
+	, mSimulationCost( simulationCost )
+	{
+	}
+	SelectionQuota() {}
+	
+	F32 mRenderCost, mPhysicsCost, mNetworkCost, mSimulationCost;	
+	S32 mLocalId;
+};
+
+#endif
+
+
+
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index 0a4cd51ea0..e8cd871157 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -1348,3 +1348,12 @@ LLParcel::ECategory category_ui_string_to_category(const std::string& s)
     // is a distinct option from "None" and "Other"
     return LLParcel::C_ANY;
 }
+
+void LLParcel::updateQuota( const LLUUID& objectId,  const ParcelQuota& quota )
+{
+	if ( mID == objectId )
+	{
+		mQuota = quota;
+	}
+}
+
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index 71b65d99ce..4893337967 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -34,7 +34,7 @@
 #include "llpermissions.h"
 #include "lltimer.h"
 #include "v3math.h"
-
+#include "llaccountingquota.h"
 
 // Grid out of which parcels taken is stepped every 4 meters.
 const F32 PARCEL_GRID_STEP_METERS	= 4.f;
@@ -586,7 +586,11 @@ public:
 	LLUUID	getPreviousOwnerID() const		{ return mPreviousOwnerID; }
 	BOOL	getPreviouslyGroupOwned() const	{ return mPreviouslyGroupOwned; }
 	BOOL	getSellWithObjects() const		{ return (mParcelFlags & PF_SELL_PARCEL_OBJECTS) ? TRUE : FALSE; }
-
+	
+	
+			void		 updateQuota( const LLUUID& objectId, const ParcelQuota& quota );
+	const	ParcelQuota& getQuota( void ) { return mQuota; }	
+	
 protected:
 	LLUUID mID;
 	LLUUID				mOwnerID;
@@ -657,8 +661,9 @@ protected:
 	BOOL				mRegionPushOverride;
 	BOOL				mRegionDenyAnonymousOverride;
 	BOOL				mRegionDenyAgeUnverifiedOverride;
-
-
+	
+	ParcelQuota			mQuota;
+	
 public:
 	// HACK, make private
 	S32					mLocalID;
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index cbf22b75e8..769dcf8457 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -77,6 +77,7 @@ include_directories(
 
 set(viewer_SOURCE_FILES
     groupchatlistener.cpp
+    llaccountingquotamanager.cpp
     llagent.cpp
     llagentaccess.cpp
     llagentcamera.cpp
@@ -626,6 +627,7 @@ set(viewer_HEADER_FILES
     CMakeLists.txt
     ViewerInstall.cmake
     groupchatlistener.h
+    llaccountingquotamanager.h
     llagent.h
     llagentaccess.h
     llagentcamera.h
diff --git a/indra/newview/llaccountingquotamanager.cpp b/indra/newview/llaccountingquotamanager.cpp
new file mode 100644
index 0000000000..ada74ea44c
--- /dev/null
+++ b/indra/newview/llaccountingquotamanager.cpp
@@ -0,0 +1,264 @@
+/** 

+ * @file LLAccountingQuotaManager.cpp

+ * @ Handles the setting and accessing for costs associated with mesh 

+ *

+ * $LicenseInfo:firstyear=2001&license=viewergpl$

+ * 

+ * Copyright (c) 2001-2010, Linden Research, Inc.

+ * 

+ * Second Life Viewer Source Code

+ * The source code in this file ("Source Code") is provided by Linden Lab

+ * to you under the terms of the GNU General Public License, version 2.0

+ * ("GPL"), unless you have obtained a separate licensing agreement

+ * ("Other License"), formally executed by you and Linden Lab.  Terms of

+ * the GPL can be found in doc/GPL-license.txt in this distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2

+ * 

+ * There are special exceptions to the terms and conditions of the GPL as

+ * it is applied to this Source Code. View the full text of the exception

+ * in the file doc/FLOSS-exception.txt in this software distribution, or

+ * online at

+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception

+ * 

+ * By copying, modifying or distributing this software, you acknowledge

+ * that you have read and understood your obligations described above,

+ * and agree to abide by those obligations.

+ * 

+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

+ * COMPLETENESS OR PERFORMANCE.

+ * $/LicenseInfo$

+ */

+

+#include "llviewerprecompiledheaders.h"

+#include "llaccountingquotamanager.h"

+#include "llagent.h"

+#include "llviewerregion.h"

+#include "llviewerobject.h"

+#include "llviewerobjectlist.h"

+#include "llviewerparcelmgr.h"

+#include "llparcel.h"

+

+//===============================================================================

+LLAccountingQuotaManager::LLAccountingQuotaManager()

+{	

+}

+//===============================================================================

+class LLAccountingQuotaResponder : public LLCurl::Responder

+{

+public:

+	LLAccountingQuotaResponder( const LLSD& objectIDs )

+	: mObjectIDs( objectIDs )

+	{

+	}

+		

+	void clearPendingRequests ( void )

+	{

+		for ( LLSD::array_iterator iter = mObjectIDs.beginArray(); iter != mObjectIDs.endArray(); ++iter )

+		{

+			LLAccountingQuotaManager::getInstance()->removePendingObjectQuota( iter->asUUID() );

+		}

+	}

+	

+	void error( U32 statusNum, const std::string& reason )

+	{

+		llwarns	<< "Transport error "<<reason<<llendl;	

+		//prep#do we really want to remove all because of one failure - verify

+		clearPendingRequests();

+	}

+	

+	void result( const LLSD& content )

+	{

+		if ( !content.isMap() || content.has("error") )

+		{

+			llwarns	<< "Error on fetched data"<< llendl;

+			//prep#do we really want to remove all because of one failure - verify

+			clearPendingRequests();

+			return;

+		}

+		

+		//Differentiate what the incoming caps could be from the data

+		//bool VOContent  = content.has("Objects");

+		bool containsParcel    = content.has("parcel");

+		bool containsSelection = content.has("selected");

+		//bool VORegion   = content.has("region");

+				

+		//Loop over the stored object ids checking against the incoming data

+		for ( LLSD::array_iterator iter = mObjectIDs.beginArray(); iter != mObjectIDs.endArray(); ++iter )

+		{

+			LLUUID objectID = iter->asUUID();

+						

+			LLAccountingQuotaManager::getInstance()->removePendingObjectQuota( objectID );

+				

+			if ( containsParcel )

+			{

+					//Typically should be one

+					S32 dataCount = content["parcel"].size();

+					for(S32 i = 0; i < dataCount; i++)

+					{

+						//prep#todo verify that this is safe, otherwise just add a bool

+						S32 parcelId = 0;

+						S32 parcelOwner = 0;

+						if ( content["parcel"][i].has("parcel_id") )

+						{

+							parcelId = content["parcel"][i]["parcel_id"].asInteger();

+						}

+						if ( content["parcel"][i].has("parcel_owner") )

+						{

+							parcelOwner = content["parcel"][i]["parcel_owner"].asInteger();

+						}

+											

+						F32 ownerRenderCost		= 0;

+						F32 ownerPhysicsCost	= 0;

+						F32 ownerNetworkCost	= 0;

+						F32 ownerSimulationCost = 0;

+						

+						F32 groupRenderCost		= 0;

+						F32 groupPhysicsCost	= 0;

+						F32 groupNetworkCost	= 0;

+						F32 groupSimulationCost = 0;

+						

+						F32 otherRenderCost		= 0;

+						F32 otherPhysicsCost	= 0;

+						F32 otherNetworkCost	= 0;

+						F32 otherSimulationCost = 0;

+						

+						F32 totalRenderCost		= 0;

+						F32 totalPhysicsCost	= 0;

+						F32 totalNetworkCost	= 0;

+						F32 totalSimulationCost = 0;

+						

+						if ( content["parcel"][i].has("owner") )

+						{

+							ownerRenderCost		= content["parcel"][i]["owner"]["render"].asReal();

+							ownerPhysicsCost	= content["parcel"][i]["owner"]["physics"].asReal();

+							ownerNetworkCost	= content["parcel"][i]["owner"]["network"].asReal();

+							ownerSimulationCost = content["parcel"][i]["owner"]["simulation"].asReal();

+							

+						}

+						if ( content["parcel"][i].has("group") )

+						{

+							groupRenderCost		= content["parcel"][i]["group"]["render"].asReal();

+							groupPhysicsCost	= content["parcel"][i]["group"]["physics"].asReal();

+							groupNetworkCost	= content["parcel"][i]["group"]["network"].asReal();

+							groupSimulationCost = content["parcel"][i]["group"]["simulation"].asReal();

+							

+						}

+						if ( content["parcel"][i].has("other") )

+						{

+							otherRenderCost		= content["parcel"][i]["other"]["render"].asReal();

+							otherPhysicsCost	= content["parcel"][i]["other"]["physics"].asReal();

+							otherNetworkCost	= content["parcel"][i]["other"]["network"].asReal();

+							otherSimulationCost = content["parcel"][i]["other"]["simulation"].asReal();

+						}

+						

+						if ( content["parcel"][i].has("total") )

+						{

+							totalRenderCost		= content["parcel"][i]["total"]["render"].asReal();

+							totalPhysicsCost	= content["parcel"][i]["total"]["physics"].asReal();

+							totalNetworkCost	= content["parcel"][i]["total"]["network"].asReal();

+							totalSimulationCost = content["parcel"][i]["total"]["simulation"].asReal();

+							

+						}

+						

+						ParcelQuota parcelQuota( ownerRenderCost, ownerPhysicsCost, ownerNetworkCost, ownerSimulationCost,

+												 groupRenderCost, groupPhysicsCost, groupNetworkCost, groupSimulationCost,

+												 otherRenderCost, otherPhysicsCost, otherNetworkCost, otherSimulationCost,

+												 totalRenderCost, totalPhysicsCost, totalNetworkCost, totalSimulationCost );

+						//Update the Parcel						

+						LLParcel* pParcel = LLViewerParcelMgr::getInstance()->getParcelSelection()->getParcel();

+						if ( pParcel )

+						{

+							pParcel->updateQuota( objectID, parcelQuota ); 

+						}

+					}					

+				}

+			else 

+			if ( containsSelection )

+			{

+				S32 dataCount = content["selected"].size();

+				for(S32 i = 0; i < dataCount; i++)

+				{

+					

+					F32 renderCost		= 0;

+					F32 physicsCost		= 0;

+					F32 networkCost		= 0;

+					F32 simulationCost	= 0;

+					

+					S32 localId = 0;

+					

+					localId			= content["selected"][i]["local_id"].asInteger();

+					renderCost		= content["selected"][i]["render"].asReal();

+					physicsCost		= content["selected"][i]["physics"].asReal();

+					networkCost		= content["selected"][i]["network"].asReal();

+					simulationCost	= content["selected"][i]["simulation"].asReal();

+					

+					SelectionQuota selectionQuota( localId, renderCost, physicsCost, networkCost, simulationCost );

+					

+					//Update the objects					

+					//gObjectList.updateQuota( localId, selectionQuota ); 

+					

+				}

+			}

+			else

+			{

+				//Nothing in string 

+				LLAccountingQuotaManager::getInstance()->removePendingObjectQuota( objectID );

+			}

+		}

+	}

+	

+private:

+	//List of posted objects

+	LLSD mObjectIDs;

+};

+//===============================================================================

+void LLAccountingQuotaManager::fetchQuotas( const std::string& url )

+{

+	// Invoking system must have already determined capability availability

+	if ( !url.empty() )

+	{

+		LLSD objectList;

+		U32  objectIndex = 0;

+		IDIt IDIter = mUpdateObjectQuota.begin();

+		IDIt IDIterEnd = mUpdateObjectQuota.end();

+		

+		for ( ; IDIter != IDIterEnd; ++IDIter )

+		{

+			// Check to see if a request for this object has already been made.

+			if ( mPendingObjectQuota.find( *IDIter ) ==	mPendingObjectQuota.end() )

+			{

+				mPendingObjectQuota.insert( *IDIter );	

+				objectList[objectIndex++] = *IDIter;

+			}

+		}

+	

+		mUpdateObjectQuota.clear();

+		

+		//Post results

+		if ( objectList.size() > 0 )

+		{

+			LLSD dataToPost = LLSD::emptyMap();			

+			dataToPost["object_ids"] = objectList;

+			LLHTTPClient::post( url, dataToPost, new LLAccountingQuotaResponder( objectList ));

+		}

+	}

+	else

+	{

+		//url was empty - warn & continue

+		llwarns<<"Supplied url is empty "<<llendl;

+		mUpdateObjectQuota.clear();

+		mPendingObjectQuota.clear();

+	}

+}

+//===============================================================================

+void LLAccountingQuotaManager::updateObjectCost( const LLUUID& objectID )

+{

+	mUpdateObjectQuota.insert( objectID );

+}

+//===============================================================================

+void LLAccountingQuotaManager::removePendingObjectQuota( const LLUUID& objectID )

+{

+	mPendingObjectQuota.erase( objectID );

+}

+//===============================================================================

diff --git a/indra/newview/llaccountingquotamanager.h b/indra/newview/llaccountingquotamanager.h
new file mode 100644
index 0000000000..4c20561bce
--- /dev/null
+++ b/indra/newview/llaccountingquotamanager.h
@@ -0,0 +1,60 @@
+/** 
+ * @file lllAccountingQuotaManager.h
+ * @
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_ACCOUNTINGQUOTAMANAGER_H
+#define LL_ACCOUNTINGQUOTAMANAGER_H
+//===============================================================================
+#include "llaccountingquota.h"
+//===============================================================================
+class LLAccountingQuotaManager : public LLSingleton<LLAccountingQuotaManager>
+{
+public:
+	//Ctor
+	LLAccountingQuotaManager();
+	//Store an object that will be eventually fetched
+	void updateObjectCost( const LLUUID& objectID );
+	//Request quotas for object list
+	void fetchQuotas( const std::string& url );
+	//Delete a specific object from the pending list
+	void removePendingObjectQuota( const LLUUID& objectID );
+	
+private:
+	//Set of objects that need to update their cost
+	std::set<LLUUID> mUpdateObjectQuota;
+	//During fetchQuota we move object into a the pending set to signify that 
+	//a fetch has been instigated.
+	std::set<LLUUID> mPendingObjectQuota;
+	typedef std::set<LLUUID>::iterator IDIt;
+};
+//===============================================================================
+
+#endif
\ No newline at end of file
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 73c1f99fa0..061a42ab57 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -85,6 +85,7 @@
 #include "llviewerwindow.h"
 #include "llvovolume.h"
 #include "lluictrlfactory.h"
+#include "llaccountingquotamanager.h"
 
 // Globals
 LLFloaterTools *gFloaterTools = NULL;
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index f5fee662e6..e7878d8adf 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -102,6 +102,7 @@
 #include "lltrans.h"
 #include "llsdutil.h"
 #include "llmediaentry.h"
+#include "llaccountingquota.h"
 
 //#define DEBUG_UPDATE_TYPE
 
@@ -5702,3 +5703,10 @@ public:
 
 LLHTTPRegistration<ObjectPhysicsProperties>
 	gHTTPRegistrationObjectPhysicsProperties("/message/ObjectPhysicsProperties");
+
+
+void LLViewerObject::updateQuota( const SelectionQuota& quota )
+{
+	//update quotas
+	mSelectionQuota = quota;
+}
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 21198f7dd1..a0ad52df6b 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -43,6 +43,7 @@
 #include "v3dmath.h"
 #include "v3math.h"
 #include "llvertexbuffer.h"
+#include "llaccountingquota.h"
 
 class LLAgent;			// TODO: Get rid of this.
 class LLAudioSource;
@@ -643,7 +644,11 @@ protected:
 	void unpackParticleSource(LLDataPacker &dp, const LLUUID& owner_id);
 	void deleteParticleSource();
 	void setParticleSource(const LLPartSysData& particle_parameters, const LLUUID& owner_id);
-
+	
+public:
+	void  updateQuota(  const SelectionQuota& quota );
+	const SelectionQuota& getQuota( void ) { return mSelectionQuota; }
+	
 private:
 	void setNameValueList(const std::string& list);		// clears nv pairs and then individually adds \n separated NV pairs from \0 terminated string
 	void deleteTEImages(); // correctly deletes list of images
@@ -705,6 +710,8 @@ protected:
 	F32 mPhysicsCost;
 	F32 mLinksetPhysicsCost;
 
+	SelectionQuota mSelectionQuota;
+	
 	bool mCostStale;
 	mutable bool mPhysicsShapeUnknown;
 
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index ab2e07e4df..007b3416f1 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -1418,6 +1418,15 @@ void LLViewerObjectList::onObjectCostFetchFailure(const LLUUID& object_id)
 	mPendingObjectCost.erase(object_id);
 }
 
+void LLViewerObjectList::updateQuotaCost( const LLUUID& objectId, const SelectionQuota& quota  )
+{
+	LLViewerObject* pVO = findObject( objectId );
+	if ( pVO )
+	{
+		//pVO->updateQuota( quota );
+	}
+}
+
 void LLViewerObjectList::updatePhysicsFlags(const LLViewerObject* object)
 {
 	mStalePhysicsFlags.insert(object->getID());
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index 65374bca70..8e211eaf73 100644
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -36,6 +36,7 @@
 
 // project includes
 #include "llviewerobject.h"
+#include "llaccountingquota.h"
 
 class LLCamera;
 class LLNetMap;
@@ -101,6 +102,8 @@ public:
 									F32 restitution,
 									F32 gravity_multiplier);
 
+	void updateQuotaCost( const LLUUID& objectId, const SelectionQuota& costs );
+	
 	void shiftObjects(const LLVector3 &offset);
 
 	bool hasMapObjectInRegion(LLViewerRegion* regionp) ;
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index f835351c04..590c82856d 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1545,6 +1545,11 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
 	capabilityNames.append("ViewerMetrics");
 	capabilityNames.append("ViewerStartAuction");
 	capabilityNames.append("ViewerStats");
+	//prep# Finalize these!!!!!!!!!
+	//capabilityNames.append("AccountingVO");	
+	capabilityNames.append("AccountingParcel");
+	capabilityNames.append("AccountingRegion");
+	
 	// Please add new capabilities alphabetically to reduce
 	// merge conflicts.
 
@@ -1658,3 +1663,4 @@ std::string LLViewerRegion::getDescription() const
 {
     return stringize(*this);
 }
+
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 9c5b85b77f..a6e5c47b86 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -275,6 +275,7 @@ public:
 	F32 getLandHeightRegion(const LLVector3& region_pos);
 
 	void getInfo(LLSD& info);
+	
 
 	typedef enum
 	{