diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-02 23:15:38 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-02 23:15:38 +0300 |
commit | 363e9c949bf1179575fafa65d504d04383efbc1e (patch) | |
tree | d5ae7ad286b42c602293f2081969790e9285b035 /indra/llaudio/llaudioengine_openal.h | |
parent | aaaf3189c400e491c6adc533f8b03dfecddb1dd9 (diff) | |
parent | 1702a65665879d0c68df4c6b4fdb60f815ab7abb (diff) |
Merge branch 'master' into DRTVWR-503-maint
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/viewer_manifest.py
Diffstat (limited to 'indra/llaudio/llaudioengine_openal.h')
-rw-r--r-- | indra/llaudio/llaudioengine_openal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llaudio/llaudioengine_openal.h b/indra/llaudio/llaudioengine_openal.h index 6639d9dfe6..366f9259e3 100644 --- a/indra/llaudio/llaudioengine_openal.h +++ b/indra/llaudio/llaudioengine_openal.h @@ -40,8 +40,8 @@ class LLAudioEngine_OpenAL : public LLAudioEngine LLAudioEngine_OpenAL(); virtual ~LLAudioEngine_OpenAL(); - virtual bool init(const S32 num_channels, void *user_data); - virtual std::string getDriverName(bool verbose); + virtual bool init(const S32 num_channels, void *user_data, const std::string &app_title); + virtual std::string getDriverName(bool verbose); virtual void allocateListener(); virtual void shutdown(); |