diff options
| author | Anders Arnholm | 2008-12-13 18:49:24 +0100 |
|---|---|---|
| committer | Anders Arnholm | 2008-12-13 18:49:24 +0100 |
| commit | c7fca44072ae101b986a87c87ebda1e99de5141a (patch) | |
| tree | a9884591ca07983234a0ed41275d7b92dc513f46 /linden/indra/llaudio | |
| parent | Merge 1.0.0 RC2 into openal (diff) | |
| parent | Merge branch 'next' of git://github.com/jacek/imprudence into next (diff) | |
| download | meta-impy-c7fca44072ae101b986a87c87ebda1e99de5141a.zip meta-impy-c7fca44072ae101b986a87c87ebda1e99de5141a.tar.gz meta-impy-c7fca44072ae101b986a87c87ebda1e99de5141a.tar.bz2 meta-impy-c7fca44072ae101b986a87c87ebda1e99de5141a.tar.xz | |
Merge branch 'next' into openal
Conflicts:
ChangeLog.txt
Diffstat (limited to 'linden/indra/llaudio')
| -rw-r--r-- | linden/indra/llaudio/audioengine.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llaudio/audioengine.h b/linden/indra/llaudio/audioengine.h index aff7759..15cb35f 100644 --- a/linden/indra/llaudio/audioengine.h +++ b/linden/indra/llaudio/audioengine.h | |||
| @@ -83,7 +83,7 @@ class LLAudioEngine | |||
| 83 | friend class LLAudioChannelOpenAL; // bleh. channel needs some listener methods. | 83 | friend class LLAudioChannelOpenAL; // bleh. channel needs some listener methods. |
| 84 | 84 | ||
| 85 | public: | 85 | public: |
| 86 | typedef enum LLAudioType | 86 | enum LLAudioType |
| 87 | { | 87 | { |
| 88 | AUDIO_TYPE_NONE = 0, | 88 | AUDIO_TYPE_NONE = 0, |
| 89 | AUDIO_TYPE_SFX = 1, | 89 | AUDIO_TYPE_SFX = 1, |