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/llviewermenufile.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 '')
| -rw-r--r-- | linden/indra/newview/llviewermenufile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp index 4d46a8f..031e6d4 100644 --- a/linden/indra/newview/llviewermenufile.cpp +++ b/linden/indra/newview/llviewermenufile.cpp | |||
| @@ -796,7 +796,7 @@ void upload_new_resource(const LLString& src_filename, std::string name, | |||
| 796 | } | 796 | } |
| 797 | } | 797 | } |
| 798 | 798 | ||
| 799 | void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result) // StoreAssetData callback (fixed) | 799 | void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result, LLExtStat ext_status) // StoreAssetData callback (fixed) |
| 800 | { | 800 | { |
| 801 | LLResourceData* data = (LLResourceData*)user_data; | 801 | LLResourceData* data = (LLResourceData*)user_data; |
| 802 | //LLAssetType::EType pref_loc = data->mPreferredLocation; | 802 | //LLAssetType::EType pref_loc = data->mPreferredLocation; |