diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index fb39544351..d45af63ace 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -22448,6 +22448,17 @@ Change of this parameter will affect the layout of buttons in notification toast Value 1 + FSShowVoiceVisualizerAsWavesOnly + + Comment + Hides the voice dot over avatars and shows only voice waves. + Persist + 1 + Type + Boolean + Value + 0 + FSSelectIncludeGroupOwned Comment diff --git a/indra/newview/llvoicevisualizer.cpp b/indra/newview/llvoicevisualizer.cpp index 6e08a2ff12..6a926dcd18 100644 --- a/indra/newview/llvoicevisualizer.cpp +++ b/indra/newview/llvoicevisualizer.cpp @@ -374,25 +374,33 @@ void LLVoiceVisualizer::render() // bind texture 0 (the dot) //----------------------------- gGL.getTexUnit(0)->bind(mSoundSymbol.mTexture[0]); - - //------------------------------------------------------------- - // now render the dot - //------------------------------------------------------------- - gGL.color4fv( LLColor4( 1.0f, 1.0f, 1.0f, DOT_OPACITY ).mV ); - - gGL.begin( LLRender::TRIANGLE_STRIP ); - gGL.texCoord2i( 0, 0 ); gGL.vertex3fv( bottomLeft.mV ); - gGL.texCoord2i( 1, 0 ); gGL.vertex3fv( bottomRight.mV ); - gGL.texCoord2i( 0, 1 ); gGL.vertex3fv( topLeft.mV ); - gGL.end(); - gGL.begin( LLRender::TRIANGLE_STRIP ); - gGL.texCoord2i( 1, 0 ); gGL.vertex3fv( bottomRight.mV ); - gGL.texCoord2i( 1, 1 ); gGL.vertex3fv( topRight.mV ); - gGL.texCoord2i( 0, 1 ); gGL.vertex3fv( topLeft.mV ); - gGL.end(); - + // FIRE-22570: Option to show visualizers as waves without the dot + static LLCachedControl fsShowVoiceVisualizerAsWavesOnly(gSavedSettings, "FSShowVoiceVisualizerAsWavesOnly"); + if (!fsShowVoiceVisualizerAsWavesOnly) + { + // + + //------------------------------------------------------------- + // now render the dot + //------------------------------------------------------------- + gGL.color4fv( LLColor4( 1.0f, 1.0f, 1.0f, DOT_OPACITY ).mV ); + + gGL.begin( LLRender::TRIANGLE_STRIP ); + gGL.texCoord2i( 0, 0 ); gGL.vertex3fv( bottomLeft.mV ); + gGL.texCoord2i( 1, 0 ); gGL.vertex3fv( bottomRight.mV ); + gGL.texCoord2i( 0, 1 ); gGL.vertex3fv( topLeft.mV ); + gGL.end(); + + gGL.begin( LLRender::TRIANGLE_STRIP ); + gGL.texCoord2i( 1, 0 ); gGL.vertex3fv( bottomRight.mV ); + gGL.texCoord2i( 1, 1 ); gGL.vertex3fv( topRight.mV ); + gGL.texCoord2i( 0, 1 ); gGL.vertex3fv( topLeft.mV ); + gGL.end(); + // FIRE-22570: Option to show visualizers as waves without the dot + } + // //-------------------------------------------------------------------------------------- // if currently speaking, trigger waves (1 through 6) based on speaking amplitude diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index ec561e66e7..92de233754 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -961,6 +961,18 @@ name="FSShowMyOwnVoiceVisualizer" top_pad="3" width="237"/> + +