diff options
author | Oz Linden <oz@lindenlab.com> | 2013-01-17 13:54:39 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-01-17 13:54:39 -0500 |
commit | 841dc5da2ef9626fa4ab9255681d217df62a6b0b (patch) | |
tree | 2c5bacebcb27b78d318b6e162334488f6e515974 /indra/llaudio | |
parent | b7f8a2479249646c7fb38ead195d5197ab733c94 (diff) | |
parent | d16757545c91d4f7dac3c52a311ad0f0239052e1 (diff) |
merge up to 3.4.4
Diffstat (limited to 'indra/llaudio')
-rw-r--r-- | indra/llaudio/llaudioengine.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp index 72c0091d17..ef560cd7fc 100644 --- a/indra/llaudio/llaudioengine.cpp +++ b/indra/llaudio/llaudioengine.cpp @@ -1792,5 +1792,3 @@ bool LLAudioData::load() mBufferp->mAudioDatap = this; return true; } - - |