diff options
| author | Jacek Antonelli | 2009-09-23 02:29:44 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-23 02:29:44 -0500 |
| commit | cd2b97b3e6446449443700ae9a1521c402c93850 (patch) | |
| tree | 0c45e5a05cdcb6956fb859c9fef834a5c5613a04 /linden/indra/llaudio | |
| parent | Commented out Linux tarball building. (diff) | |
| parent | Display selected avatars larger than normal, zoom in at a reasonable speed. I... (diff) | |
| download | meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.zip meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.gz meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.bz2 meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Conflicts:
linden/indra/newview/llfloaterchat.cpp
linden/indra/newview/llfloatermap.cpp
linden/indra/newview/llinventorybridge.cpp
linden/indra/newview/llnetmap.cpp
linden/indra/newview/llviewermessage.cpp
linden/indra/newview/llviewerobjectlist.cpp
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 d289ba5..579f58f 100644 --- a/linden/indra/llaudio/audioengine.h +++ b/linden/indra/llaudio/audioengine.h | |||
| @@ -182,6 +182,8 @@ public: | |||
| 182 | static void assetCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 result_code, LLExtStat ext_status); | 182 | static void assetCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 result_code, LLExtStat ext_status); |
| 183 | 183 | ||
| 184 | friend class LLPipeline; // For debugging | 184 | friend class LLPipeline; // For debugging |
| 185 | |||
| 186 | LLMediaBase * getStreamMedia() { return mInternetStreamMedia; } | ||
| 185 | public: | 187 | public: |
| 186 | F32 mMaxWindGain; // Hack. Public to set before fade in? | 188 | F32 mMaxWindGain; // Hack. Public to set before fade in? |
| 187 | 189 | ||