diff options
| author | Samantha Patterson <aura@lindenlab.com> | 2007-06-25 21:35:12 +0000 |
|---|---|---|
| committer | Samantha Patterson <aura@lindenlab.com> | 2007-06-25 21:35:12 +0000 |
| commit | e24e6a3fed6676a73321baf03532a54da22fa227 (patch) | |
| tree | f24790f29067ede90432b3777e3769b8f6d21ea1 | |
| parent | 69383de1e7ae1c3f9b0f7a7003ab522fd35f837f (diff) | |
Lost changes to some virtual function overrides.
| -rw-r--r-- | indra/newview/llviewerassetstorage.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llviewerassetstorage.h | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp index e0a6786cb8..8ef77fa496 100644 --- a/indra/newview/llviewerassetstorage.cpp +++ b/indra/newview/llviewerassetstorage.cpp @@ -37,7 +37,9 @@ void LLViewerAssetStorage::storeAssetData( void* user_data, bool temp_file, bool is_priority, - bool store_local) + bool store_local, + bool user_waiting, + F64 timeout) { LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID()); llinfos << "LLViewerAssetStorage::storeAssetData (legacy) " << tid << ":" << LLAssetType::lookup(asset_type) @@ -141,7 +143,9 @@ void LLViewerAssetStorage::storeAssetData( LLStoreAssetCallback callback, void* user_data, bool temp_file, - bool is_priority) + bool is_priority, + bool user_waiting, + F64 timeout) { if(!filename) { diff --git a/indra/newview/llviewerassetstorage.h b/indra/newview/llviewerassetstorage.h index 15dc533f09..7817e6450f 100644 --- a/indra/newview/llviewerassetstorage.h +++ b/indra/newview/llviewerassetstorage.h @@ -32,7 +32,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); virtual void storeAssetData( const char* filename, @@ -41,7 +43,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); }; #endif |