Second Life viewer sources 1.14.0.0

1 files changed, 23 insertions, 9 deletions

diff --git a/linden/indra/llmessage/llhttpassetstorage.h b/linden/indra/llmessage/llhttpassetstorage.h
index d09e2ce..d98af45 100644
--- a/linden/indra/llmessage/llhttpassetstorage.h
+++ b/linden/indra/llmessage/llhttpassetstorage.h
@@ -32,6 +32,7 @@
 #include "curl/curl.h"
 
 class LLVFile;
+class LLHTTPAssetRequest;
 typedef void (*progress_callback)(void* userdata);
 
 struct LLTempAssetData;
@@ -75,11 +76,25 @@ public:
                 bool temp_file,
                 bool is_priority);
 
+        virtual LLSD getPendingDetails(ERequestType rt,
+                                        LLAssetType::EType asset_type,
+                                        const std::string& detail_prefix) const;
+
+        virtual LLSD getPendingRequest(ERequestType rt,
+                                                        LLAssetType::EType asset_type,
+                                                        const LLUUID& asset_id) const;
+
+        virtual bool deletePendingRequest(ERequestType rt,
+                                                        LLAssetType::EType asset_type,
+                                                        const LLUUID& asset_id);
+
         // Hack.  One off curl download an URL to a file.  Probably should be elsewhere.
         // Only used by lldynamicstate.  The API is broken, and should be replaced with
         // a generic HTTP file fetch - Doug 9/25/06
         S32 getURLToFile(const LLUUID& uuid, LLAssetType::EType asset_type, const LLString &url, const char *filename, progress_callback callback, void *userdata);
         
+        LLAssetRequest* findNextRequest(request_list_t& pending, request_list_t& running);
+
         void checkForTimeouts();
         
         static size_t curlDownCallback(void *data, size_t size, size_t nmemb, void *user_data);
@@ -88,12 +103,11 @@ public:
         static size_t nullOutputCallback(void *data, size_t size, size_t nmemb, void *user_data);
 
         // Should only be used by the LLHTTPAssetRequest
-        void setPendingUpload()                 { mPendingUpload = TRUE; }
-        void setPendingLocalUpload()    { mPendingLocalUpload = TRUE; }
-        void setPendingDownload()               { mPendingDownload = TRUE; }
-        void clearPendingUpload()               { mPendingUpload = FALSE; }
-        void clearPendingLocalUpload()  { mPendingLocalUpload = FALSE; }
-        void clearPendingDownload()             { mPendingDownload = FALSE; }
+        void addRunningRequest(ERequestType rt, LLHTTPAssetRequest* request);
+        void removeRunningRequest(ERequestType rt, LLHTTPAssetRequest* request);
+
+        request_list_t* getRunningList(ERequestType rt);
+        const request_list_t* getRunningList(ERequestType rt) const;
 
         // Temp assets are stored on sim nodes, they have agent ID and location data associated with them.
         virtual void addTempAssetData(const LLUUID& asset_id, const LLUUID& agent_id, const std::string& host_name);
@@ -125,9 +139,9 @@ protected:
 
         CURLM  *mCurlMultiHandle;
 
-        BOOL mPendingDownload;
-        BOOL mPendingUpload;
-        BOOL mPendingLocalUpload;
+        request_list_t mRunningDownloads;
+        request_list_t mRunningUploads;
+        request_list_t mRunningLocalUploads;
 
         uuid_tempdata_map mTempAssets;
 };