diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-11-13 19:04:25 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-11-13 19:04:25 -0500 |
| commit | b6b12d0ded7573397cdcf9284cff4c6f8937f726 (patch) | |
| tree | b1b2694a494701dfb808ddc310e54ac31b7feeca /indra/llaudio | |
| parent | be210914f4e9081f021cc1ad3b671765aba79b61 (diff) | |
| parent | d65df92ef4719e0d4c98c5eafda9c7d19ae220c4 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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; } - - |