diff options
author | Dave Houlton <euclid@lindenlab.com> | 2020-06-19 10:18:56 -0600 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2020-06-19 10:18:56 -0600 |
commit | ba6a0f3f332ffc659b00ca4c298b96efe56c6b81 (patch) | |
tree | a543deec1323c4dc1cc42207277d0c47bbebdb66 /indra/llaudio/llaudioengine.cpp | |
parent | b84e79e0f206ac49aa57c4ad2d8d3dd7b5d2fc4d (diff) | |
parent | 1702a65665879d0c68df4c6b4fdb60f815ab7abb (diff) |
Merge branch 'master' 6.4.4 into DRTVWR-510
Diffstat (limited to 'indra/llaudio/llaudioengine.cpp')
-rw-r--r-- | indra/llaudio/llaudioengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp index f49028aad5..1d447f32ae 100644 --- a/indra/llaudio/llaudioengine.cpp +++ b/indra/llaudio/llaudioengine.cpp @@ -111,7 +111,7 @@ void LLAudioEngine::setDefaults() } -bool LLAudioEngine::init(const S32 num_channels, void* userdata) +bool LLAudioEngine::init(const S32 num_channels, void* userdata, const std::string &app_title) { setDefaults(); |