1 files changed, 19 insertions, 19 deletions

diff --git a/linden/indra/newview/llinventorymodel.h b/linden/indra/newview/llinventorymodel.h
index 8017410..d2be761 100644
--- a/linden/indra/newview/llinventorymodel.h
+++ b/linden/indra/newview/llinventorymodel.h
@@ -69,6 +69,7 @@ public:
         };
         virtual ~LLInventoryObserver() {};
         virtual void changed(U32 mask) = 0;
+        std::string mMessageName; // used by Agent Inventory Service only. [DEV-20328]
 };
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -110,20 +111,17 @@ public:
         LLInventoryModel();
         ~LLInventoryModel();
 
-        class fetchDescendentsResponder: public LLHTTPClient::Responder
+        class fetchInventoryResponder: 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;
+        public:
+                fetchInventoryResponder(const LLSD& request_sd) : mRequestSD(request_sd) {};
+                void result(const LLSD& content);                       
+                void error(U32 status, const std::string& reason);
+
+        public:
+                typedef std::vector<LLViewerInventoryCategory*> folder_ref_t;
+        protected:
+                LLSD mRequestSD;
         };
 
         //
@@ -268,7 +266,8 @@ public:
         // Call this method when it's time to update everyone on a new
         // state, by default, the inventory model will not update
         // observers automatically.
-        void notifyObservers();
+        // The optional argument 'service_name' is used by Agent Inventory Service [DEV-20328]
+        void notifyObservers(const std::string service_name="");
 
         // This allows outsiders to tell the inventory if something has
         // been changed 'under the hood', but outside the control of the
@@ -370,7 +369,7 @@ 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 void findLostItems();
         static BOOL backgroundFetchActive();
         static bool isEverythingFetched();
         static void backgroundFetch(void*); // background fetch idle function
@@ -419,7 +418,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);
 
@@ -460,11 +458,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;
@@ -477,6 +472,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