diff options
author | Jacek Antonelli | 2008-08-15 23:45:55 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:55 -0500 |
commit | 9063e60aefe54f7c45aaa8cb24e8998b2c7343ab (patch) | |
tree | 1c8235465701c910a5d76448ddc8eb1f14457ebc /linden/indra/llaudio | |
parent | Second Life viewer sources 1.20.9 (diff) | |
download | meta-impy-9063e60aefe54f7c45aaa8cb24e8998b2c7343ab.zip meta-impy-9063e60aefe54f7c45aaa8cb24e8998b2c7343ab.tar.gz meta-impy-9063e60aefe54f7c45aaa8cb24e8998b2c7343ab.tar.bz2 meta-impy-9063e60aefe54f7c45aaa8cb24e8998b2c7343ab.tar.xz |
Second Life viewer sources 1.20.10
Diffstat (limited to 'linden/indra/llaudio')
-rw-r--r-- | linden/indra/llaudio/audioengine.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/linden/indra/llaudio/audioengine.cpp b/linden/indra/llaudio/audioengine.cpp index 05636c1..af43b42 100644 --- a/linden/indra/llaudio/audioengine.cpp +++ b/linden/indra/llaudio/audioengine.cpp | |||
@@ -1621,16 +1621,14 @@ LLAudioData::LLAudioData(const LLUUID &uuid) : | |||
1621 | // This is a null sound. | 1621 | // This is a null sound. |
1622 | return; | 1622 | return; |
1623 | } | 1623 | } |
1624 | llassert_always(gAudiop) ; | 1624 | |
1625 | llassert_always(gAssetStorage) ; | 1625 | if (gAudiop && gAudiop->hasDecodedFile(uuid)) |
1626 | |||
1627 | if (gAudiop->hasDecodedFile(uuid)) | ||
1628 | { | 1626 | { |
1629 | // Already have a decoded version, don't need to decode it. | 1627 | // Already have a decoded version, don't need to decode it. |
1630 | mHasLocalData = TRUE; | 1628 | mHasLocalData = TRUE; |
1631 | mHasDecodedData = TRUE; | 1629 | mHasDecodedData = TRUE; |
1632 | } | 1630 | } |
1633 | else if (gAssetStorage->hasLocalAsset(uuid, LLAssetType::AT_SOUND)) | 1631 | else if (gAssetStorage && gAssetStorage->hasLocalAsset(uuid, LLAssetType::AT_SOUND)) |
1634 | { | 1632 | { |
1635 | mHasLocalData = TRUE; | 1633 | mHasLocalData = TRUE; |
1636 | } | 1634 | } |