1 files changed, 15 insertions, 4 deletions

diff --git a/linden/indra/llmessage/llassetstorage.h b/linden/indra/llmessage/llassetstorage.h
index f80a77d..ab12b7a 100644
--- a/linden/indra/llmessage/llassetstorage.h
+++ b/linden/indra/llmessage/llassetstorage.h
@@ -95,6 +95,7 @@ public:
 
         void setUUID(const LLUUID& id) { mUUID = id; }
         void setType(LLAssetType::EType type) { mType = type; }
+        void setTimeout (F64 timeout) { mTimeout = timeout; }
 
 protected:
         LLUUID  mUUID;
@@ -109,7 +110,9 @@ public:
         LLHost  mHost;
         BOOL    mIsTemp;
         BOOL    mIsLocal;
+        BOOL    mIsUserWaiting;         // We don't want to try forever if a user is waiting for a result.
         F64             mTime;                          // Message system time
+        F64             mTimeout;                       // Amount of time before timing out.
         BOOL    mIsPriority;
         BOOL    mDataSentInFirstPacket;
         BOOL    mDataIsInVFS;
@@ -252,7 +255,9 @@ public:
                 void* user_data,
                 bool temp_file = false,
                 bool is_priority = false,
-                bool store_local = false);
+                bool store_local = false,
+                bool user_waiting= false,
+                F64 timeout=LL_ASSET_STORAGE_TIMEOUT);
 
         /*
          * AssetID version
@@ -266,7 +271,9 @@ public:
                 bool temp_file = false,
                 bool is_priority = false,
                 bool store_local = false,
-                const LLUUID& requesting_agent_id = LLUUID::null);
+                const LLUUID& requesting_agent_id = LLUUID::null,
+                bool user_waiting= false,
+                F64 timeout=LL_ASSET_STORAGE_TIMEOUT);
 
         virtual void checkForTimeouts();
 
@@ -360,7 +367,9 @@ public:
                 LLStoreAssetCallback callback,
                 void* user_data,
                 bool temp_file = false,
-                bool is_priority = false);
+                bool is_priority = false,
+                bool user_waiting = false,
+                F64 timeout  = LL_ASSET_STORAGE_TIMEOUT);
 
         /*
          * TransactionID version
@@ -372,7 +381,9 @@ public:
                 LLStoreAssetCallback callback,
                 void *user_data,
                 bool temp_file = false,
-                bool is_priority = false);
+                bool is_priority = false,
+                bool user_waiting = false,
+                F64 timeout  = LL_ASSET_STORAGE_TIMEOUT);
 
         static void legacyGetDataCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType, void *user_data, S32 status);
         static void legacyStoreDataCallback(const LLUUID &uuid, void *user_data, S32 status);