summaryrefslogtreecommitdiff
path: root/indra/llaudio/llaudioengine.cpp
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-11-21 15:07:17 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-11-21 15:07:17 -0800
commitea0461c01287a2b026b5621616fb811bfc2d68a2 (patch)
treef1e94df52aa6f5a68f008278cbaec0eaca063a4a /indra/llaudio/llaudioengine.cpp
parent76990fab4f3c73ab1b2051421c52444de28f9d32 (diff)
parenta830812172d7eb163c06ead3155dc4b43ded4346 (diff)
Pull and merge https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/llaudio/llaudioengine.cpp')
-rw-r--r--indra/llaudio/llaudioengine.cpp2
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;
}
-
-