svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841

this is a combined mergeback of the following branches as per QAR-841:
  maint-server/maint-server-1 (absorbed by maint-server-2)
  maint-server/maint-server-2
  maint-server/maint-server-3
  havok4/havok4-8
  havok4/havok4-9

yes dataserver-is-deprecated

1 files changed, 6 insertions, 20 deletions

diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index 85eb46404b..4889d622dc 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -110,21 +110,7 @@ public:
 	LLInventoryModel();
 	~LLInventoryModel();
 
-	class fetchDescendentsResponder: public LLHTTPClient::Responder
-	{
-		public:
-			fetchDescendentsResponder(const LLSD& request_sd) : mRequestSD(request_sd) {};
-			void result(const LLSD& content);			
-			void error(U32 status, const std::string& reason);
-			static void onClickRetry(S32 option, void* userdata);
-			static void appendRetryList(LLSD retry_sd);
-		public:
-			typedef std::vector<LLViewerInventoryCategory*> folder_ref_t;
-		protected:
-			LLSD mRequestSD;
-			static LLSD sRetrySD;
-			static LLAlertDialog		*sRetryDialog;
-	};
+
 
 	//
 	// Accessors
@@ -364,7 +350,6 @@ public:
 	// start and stop background breadth-first fetching of inventory contents
 	// this gets triggered when performing a filter-search
 	static void startBackgroundFetch(const LLUUID& cat_id = LLUUID::null); // start fetch process
-	static void stopBackgroundFetch(); // stop fetch process
 	static BOOL backgroundFetchActive();
 	static bool isEverythingFetched();
 	static void backgroundFetch(void*); // background fetch idle function
@@ -413,7 +398,6 @@ protected:
 	static void processInventoryDescendents(LLMessageSystem* msg, void**);
 	static void processMoveInventoryItem(LLMessageSystem* msg, void**);
 	static void processFetchInventoryReply(LLMessageSystem* msg, void**);
-	static bool isBulkFetchProcessingComplete();
 	
 	bool messageUpdateCore(LLMessageSystem* msg, bool do_accounting);
 
@@ -447,11 +431,8 @@ protected:
 	observer_list_t mObservers;
 
 	// completing the fetch once per session should be sufficient
-	static cat_map_t sBulkFetchMap;
 	static BOOL sBackgroundFetchActive;
 	static BOOL sTimelyFetchPending;
-	static BOOL sAllFoldersFetched; 
-	static BOOL sFullFetchStarted;
 	static S32  sNumFetchRetries;
 	static LLFrameTimer sFetchTimer;
 	static F32 sMinTimeBetweenFetches;
@@ -464,6 +445,11 @@ protected:
 public:
 	// *NOTE: DEBUG functionality
 	void dumpInventory();
+	static bool isBulkFetchProcessingComplete();
+	static void stopBackgroundFetch(); // stop fetch process
+
+	static BOOL sFullFetchStarted;
+	static BOOL sAllFoldersFetched; 
 };
 
 // a special inventory model for the agent