diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-06-22 18:23:39 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-06-22 18:23:39 +0000 |
| commit | 55c92418ef3114a58825af65f4fe531d0c4b0502 (patch) | |
| tree | 34353e0868d6ff72bb219cea67423b72402c75cf /indra/llmessage/llassetstorage.h | |
| parent | e03bb0606a10f29c8b94909a713a5bb5c69e88b7 (diff) | |
svn merge -r 63401:63939 svn+ssh://svn.lindenlab.com/svn/linden/branches/derez-asset-loss-1 --> release
NOTE: Skipped whitespace-only changes
Diffstat (limited to 'indra/llmessage/llassetstorage.h')
| -rw-r--r-- | indra/llmessage/llassetstorage.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/indra/llmessage/llassetstorage.h b/indra/llmessage/llassetstorage.h index 9777b8f1e4..df448b010e 100644 --- a/indra/llmessage/llassetstorage.h +++ b/indra/llmessage/llassetstorage.h @@ -75,6 +75,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; @@ -89,7 +90,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; @@ -232,7 +235,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 @@ -246,7 +251,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(); @@ -340,7 +347,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 @@ -352,7 +361,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); |