diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-10-20 22:34:11 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-10-20 22:34:11 +0300 |
| commit | e0ace0c722ee06f961bad6dd15abf9ba68ea540e (patch) | |
| tree | cebb7ccd24bf355a576751d71d9f8736bd72b53b /indra/llaudio/llaudioengine_fmodstudio.h | |
| parent | 589a167147fd4a316f4cf588bbb2aaa103c9d3bb (diff) | |
| parent | e45b6159666b3aa271eaaa366fb4bcade2c2a28b (diff) | |
Merge branch 'master' into DRTVWR-570-maint-Q
# Conflicts:
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
Diffstat (limited to 'indra/llaudio/llaudioengine_fmodstudio.h')
| -rw-r--r-- | indra/llaudio/llaudioengine_fmodstudio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llaudio/llaudioengine_fmodstudio.h b/indra/llaudio/llaudioengine_fmodstudio.h index f2361df1b6..d3d6d69685 100644 --- a/indra/llaudio/llaudioengine_fmodstudio.h +++ b/indra/llaudio/llaudioengine_fmodstudio.h @@ -51,7 +51,7 @@ public: virtual ~LLAudioEngine_FMODSTUDIO(); // initialization/startup/shutdown - virtual bool init(const S32 num_channels, void *user_data, const std::string &app_title); + virtual bool init(void *user_data, const std::string &app_title); virtual std::string getDriverName(bool verbose); virtual void allocateListener(); |