svn merge -r 80357:80990 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server --> release

Merge patches from 1.19.1 Server branch:

* QAR-293 Fix for hardcoded TTLs in web dataservices
* DEV-10826 fix for busted binary and notation parse if handed an unlimited parse size
* Bounce apache2 processes before starting backbone/dataserver/simulator
* Changing web-ds TTL in a way that any query that has 0 < ttl <=60 will have ttl = 61.
* Partial reversion of multiagent-chat to 1.19.0 to address fast memory leak
* Fixed minor, non user facing bug in multiagentchat
* set-classified-stats: Rewrote to use new MDB2 query reformatting syntax
* Fixed possible bad conversion of vivox data
* DEV-550, caching changes to DirClassifieds Query
* QAR-240 (DEV-8488) Prevent residents from purging stuff that isn't trash on the backend
* More mem leak fixes for multiagent-chat
* QAR-274 Fetch inventory descendents over TCP (via HTTP cap) instead of UDP
* DEV-10151: Sometimes group IMs appear to be person to person IMs
* QAR-321 Changes to crash_reporter
* DEV-11004 Speed up people search query using FORCE INDEX (PRIMARY) on the username table if the first-name query fragment is >= 3 chars
* DEV-11004 Speed up people search query using FORCE INDEX (PRIMARY).  Web service version of this, must use two named queries because we need to change the query based on input string length.

1 files changed, 25 insertions, 3 deletions

diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index b560aea8b2..79a35f78ea 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -91,6 +91,7 @@ class LLViewerInventoryItem;
 class LLViewerInventoryCategory;
 class LLMessageSystem;
 class LLInventoryCollectFunctor;
+class LLAlertDialog;
 
 class LLInventoryModel
 {
@@ -105,11 +106,26 @@ public:
 	// These are used a lot...
 	typedef LLDynamicArray<LLPointer<LLViewerInventoryCategory> > cat_array_t;
 	typedef LLDynamicArray<LLPointer<LLViewerInventoryItem> > item_array_t;
-
 	// construction & destruction
 	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
 	//
@@ -263,6 +279,9 @@ public:
 
 	// make sure we have the descendents in the structure.
 	void fetchDescendentsOf(const LLUUID& folder_id);
+	
+	// Add categories to a list to be fetched in bulk.
+	static void bulkFetch(std::string url);
 
 	// call this method to request the inventory.
 	//void requestFromServer(const LLUUID& agent_id);
@@ -348,7 +367,7 @@ public:
 	static BOOL backgroundFetchActive();
 	static bool isEverythingFetched();
 	static void backgroundFetch(void*); // background fetch idle function
-
+	static void incrBulkFetch(S16 fetching) {  sBulkFetchCount+=fetching; if (sBulkFetchCount<0) sBulkFetchCount=0; }
 protected:
 
 	// Internal methods which add inventory and make sure that all of
@@ -395,7 +414,8 @@ 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);
 
 protected:
@@ -430,6 +450,7 @@ 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; 
@@ -438,6 +459,7 @@ protected:
 	static LLFrameTimer sFetchTimer;
 	static F32 sMinTimeBetweenFetches;
 	static F32 sMaxTimeBetweenFetches;
+	static S16 sBulkFetchCount;
 
 	// This flag is used to handle an invalid inventory state.
 	bool mIsAgentInvUsable;