livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lost changes to some virtual function overrides.

master
Samantha Patterson 2007-06-25 21:35:12 +00:00
parent 69383de1e7
commit e24e6a3fed
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llviewerassetstorage.cpp
View File

@ -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)
{

8
indra/newview/llviewerassetstorage.h
View File

@ -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