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/llaudio | |
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/llaudio')
-rw-r--r-- | linden/indra/llaudio/audioengine.cpp | 3 | ||||
-rw-r--r-- | linden/indra/llaudio/audioengine.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/llaudio/audioengine.cpp b/linden/indra/llaudio/audioengine.cpp index 4428cea..373b0c1 100644 --- a/linden/indra/llaudio/audioengine.cpp +++ b/linden/indra/llaudio/audioengine.cpp | |||
@@ -1136,7 +1136,7 @@ void LLAudioEngine::startNextTransfer() | |||
1136 | 1136 | ||
1137 | 1137 | ||
1138 | // static | 1138 | // static |
1139 | void LLAudioEngine::assetCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 result_code) | 1139 | void LLAudioEngine::assetCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 result_code, LLExtStat ext_status) |
1140 | { | 1140 | { |
1141 | if (result_code) | 1141 | if (result_code) |
1142 | { | 1142 | { |
@@ -1665,3 +1665,4 @@ BOOL LLAudioData::load() | |||
1665 | return TRUE; | 1665 | return TRUE; |
1666 | } | 1666 | } |
1667 | 1667 | ||
1668 | |||
diff --git a/linden/indra/llaudio/audioengine.h b/linden/indra/llaudio/audioengine.h index 5a0186c..3b6bbd7 100644 --- a/linden/indra/llaudio/audioengine.h +++ b/linden/indra/llaudio/audioengine.h | |||
@@ -157,7 +157,7 @@ public: | |||
157 | 157 | ||
158 | // Asset callback when we're retrieved a sound from the asset server. | 158 | // Asset callback when we're retrieved a sound from the asset server. |
159 | void startNextTransfer(); | 159 | void startNextTransfer(); |
160 | static void assetCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 result_code); | 160 | static void assetCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 result_code, LLExtStat ext_status); |
161 | 161 | ||
162 | 162 | ||
163 | friend class LLPipeline; // For debugging | 163 | friend class LLPipeline; // For debugging |