diff options
Diffstat (limited to 'linden/indra/newview/llfloaterauction.cpp')
| -rw-r--r-- | linden/indra/newview/llfloaterauction.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloaterauction.cpp b/linden/indra/newview/llfloaterauction.cpp index 49da8ba..e024bde 100644 --- a/linden/indra/newview/llfloaterauction.cpp +++ b/linden/indra/newview/llfloaterauction.cpp | |||
| @@ -55,9 +55,9 @@ | |||
| 55 | ///---------------------------------------------------------------------------- | 55 | ///---------------------------------------------------------------------------- |
| 56 | 56 | ||
| 57 | void auction_j2c_upload_done(const LLUUID& asset_id, | 57 | void auction_j2c_upload_done(const LLUUID& asset_id, |
| 58 | void* user_data, S32 status); | 58 | void* user_data, S32 status, LLExtStat ext_status); |
| 59 | void auction_tga_upload_done(const LLUUID& asset_id, | 59 | void auction_tga_upload_done(const LLUUID& asset_id, |
| 60 | void* user_data, S32 status); | 60 | void* user_data, S32 status, LLExtStat ext_status); |
| 61 | 61 | ||
| 62 | ///---------------------------------------------------------------------------- | 62 | ///---------------------------------------------------------------------------- |
| 63 | /// Class llfloaterauction | 63 | /// Class llfloaterauction |
| @@ -258,7 +258,7 @@ void LLFloaterAuction::onClickOK(void* data) | |||
| 258 | /// Local function definitions | 258 | /// Local function definitions |
| 259 | ///---------------------------------------------------------------------------- | 259 | ///---------------------------------------------------------------------------- |
| 260 | 260 | ||
| 261 | void auction_tga_upload_done(const LLUUID& asset_id, void* user_data, S32 status) // StoreAssetData callback (fixed) | 261 | void auction_tga_upload_done(const LLUUID& asset_id, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed) |
| 262 | { | 262 | { |
| 263 | LLString* name = (LLString*)(user_data); | 263 | LLString* name = (LLString*)(user_data); |
| 264 | llinfos << "Upload of asset '" << *name << "' " << asset_id | 264 | llinfos << "Upload of asset '" << *name << "' " << asset_id |
| @@ -279,7 +279,7 @@ void auction_tga_upload_done(const LLUUID& asset_id, void* user_data, S32 status | |||
| 279 | } | 279 | } |
| 280 | } | 280 | } |
| 281 | 281 | ||
| 282 | void auction_j2c_upload_done(const LLUUID& asset_id, void* user_data, S32 status) // StoreAssetData callback (fixed) | 282 | void auction_j2c_upload_done(const LLUUID& asset_id, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed) |
| 283 | { | 283 | { |
| 284 | LLString* name = (LLString*)(user_data); | 284 | LLString* name = (LLString*)(user_data); |
| 285 | llinfos << "Upload of asset '" << *name << "' " << asset_id | 285 | llinfos << "Upload of asset '" << *name << "' " << asset_id |