diff options
author | Jacek Antonelli | 2008-08-15 23:45:27 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:27 -0500 |
commit | a8a62201ba762e98dff92cf49033e577fc34d8d4 (patch) | |
tree | 11f8513c5cdc222f2fac0c93eb724c089803c200 /linden/indra/newview/llvoicevisualizer.cpp | |
parent | Second Life viewer sources 1.18.6.4-RC (diff) | |
download | meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.zip meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.gz meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.bz2 meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.xz |
Second Life viewer sources 1.19.0.0
Diffstat (limited to 'linden/indra/newview/llvoicevisualizer.cpp')
-rw-r--r-- | linden/indra/newview/llvoicevisualizer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llvoicevisualizer.cpp b/linden/indra/newview/llvoicevisualizer.cpp index fa7b2fb..c931734 100644 --- a/linden/indra/newview/llvoicevisualizer.cpp +++ b/linden/indra/newview/llvoicevisualizer.cpp | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -111,7 +111,7 @@ LLVoiceVisualizer::LLVoiceVisualizer( const U8 type ) | |||
111 | for (int i=0; i<NUM_VOICE_SYMBOL_WAVES; i++) | 111 | for (int i=0; i<NUM_VOICE_SYMBOL_WAVES; i++) |
112 | { | 112 | { |
113 | mSoundSymbol.mWaveFadeOutStartTime [i] = mCurrentTime; | 113 | mSoundSymbol.mWaveFadeOutStartTime [i] = mCurrentTime; |
114 | mSoundSymbol.mTexture [i] = gImageList.getUIImageByID(sound_level_img[i]); | 114 | mSoundSymbol.mTexture [i] = gImageList.getImageByID(sound_level_img[i]); |
115 | mSoundSymbol.mWaveActive [i] = false; | 115 | mSoundSymbol.mWaveActive [i] = false; |
116 | mSoundSymbol.mWaveOpacity [i] = 1.0f; | 116 | mSoundSymbol.mWaveOpacity [i] = 1.0f; |
117 | mSoundSymbol.mWaveExpansion [i] = 1.0f; | 117 | mSoundSymbol.mWaveExpansion [i] = 1.0f; |