diff options
| author | McCabe Maxsted | 2009-10-18 17:58:27 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-10-18 17:58:27 -0700 |
| commit | e4b0e7c82d670081c071d8a3da31b5ec407b8e07 (patch) | |
| tree | 9410962bbb582eedbec448139e217f2714050777 /linden/indra/llaudio | |
| parent | Started 1.3.0 branch (diff) | |
| parent | Updated and added some Linux libs. (diff) | |
| download | meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.zip meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.gz meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.bz2 meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.xz | |
Merged working branch of 1.2 into LL 1.23 merge
Diffstat (limited to 'linden/indra/llaudio')
| -rw-r--r-- | linden/indra/llaudio/audioengine.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/llaudio/audioengine.h b/linden/indra/llaudio/audioengine.h index 5c8333c..574ed95 100644 --- a/linden/indra/llaudio/audioengine.h +++ b/linden/indra/llaudio/audioengine.h | |||
| @@ -183,6 +183,8 @@ public: | |||
| 183 | static void assetCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 result_code, LLExtStat ext_status); | 183 | static void assetCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 result_code, LLExtStat ext_status); |
| 184 | 184 | ||
| 185 | friend class LLPipeline; // For debugging | 185 | friend class LLPipeline; // For debugging |
| 186 | |||
| 187 | LLMediaBase * getStreamMedia() { return mInternetStreamMedia; } | ||
| 186 | public: | 188 | public: |
| 187 | F32 mMaxWindGain; // Hack. Public to set before fade in? | 189 | F32 mMaxWindGain; // Hack. Public to set before fade in? |
| 188 | 190 | ||