diff options
| author | Jacek Antonelli | 2008-08-15 23:45:07 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:45:07 -0500 |
| commit | 8465910c79b8e746e04fd581cca2d60399e569b9 (patch) | |
| tree | f43fec3e83c46e0d6190dca923d6fb268b52ffdd /linden/indra/newview/llfloaterimport.cpp | |
| parent | Second Life viewer sources 1.18.2.1 (diff) | |
| download | meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.zip meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.gz meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.bz2 meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.xz | |
Second Life viewer sources 1.18.3.2-RC
Diffstat (limited to 'linden/indra/newview/llfloaterimport.cpp')
| -rw-r--r-- | linden/indra/newview/llfloaterimport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloaterimport.cpp b/linden/indra/newview/llfloaterimport.cpp index f30f69d..7340c49 100644 --- a/linden/indra/newview/llfloaterimport.cpp +++ b/linden/indra/newview/llfloaterimport.cpp | |||
| @@ -510,7 +510,7 @@ void LLFloaterImport::finishImport(ImportAssetInfo *info) | |||
| 510 | } | 510 | } |
| 511 | 511 | ||
| 512 | // static | 512 | // static |
| 513 | void LLFloaterImport::asset_uploaded_callback(const LLUUID& uuid, void* user_data, S32 result) | 513 | void LLFloaterImport::asset_uploaded_callback(const LLUUID& uuid, void* user_data, S32 result, LLExtStat ext_status) |
| 514 | { | 514 | { |
| 515 | llinfos << "LLFloaterImport: Finished uploading image." << llendl; | 515 | llinfos << "LLFloaterImport: Finished uploading image." << llendl; |
| 516 | LLResourceData *resource_data = (LLResourceData*)user_data; | 516 | LLResourceData *resource_data = (LLResourceData*)user_data; |