livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-22570 Option to show voice visualizers as waves without the dot

master
PanteraPolnocy 2021-03-01 21:08:00 +01:00
parent a1ded79821
commit d8a67352b0
4 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -22448,6 +22448,17 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>FSShowVoiceVisualizerAsWavesOnly</key>
<map>
<key>Comment</key>
<string>Hides the voice dot over avatars and shows only voice waves.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>FSSelectIncludeGroupOwned</key>
<map>
<key>Comment</key>

42
indra/newview/llvoicevisualizer.cpp
View File

@ -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();
// <FS:PP> FIRE-22570: Option to show visualizers as waves without the dot
static LLCachedControl<bool> fsShowVoiceVisualizerAsWavesOnly(gSavedSettings, "FSShowVoiceVisualizerAsWavesOnly");
if (!fsShowVoiceVisualizerAsWavesOnly)
{
// </FS:PP>
//-------------------------------------------------------------
// 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();
// <FS:PP> FIRE-22570: Option to show visualizers as waves without the dot
}
// </FS:PP>
//--------------------------------------------------------------------------------------
// if currently speaking, trigger waves (1 through 6) based on speaking amplitude

12
indra/newview/skins/default/xui/en/panel_preferences_sound.xml
View File

@ -961,6 +961,18 @@
name="FSShowMyOwnVoiceVisualizer"
top_pad="3"
width="237"/>
<check_box
enabled_control="EnableVoiceChat"
control_name="FSShowVoiceVisualizerAsWavesOnly"
follows="left|top"
height="15"
label="Show visualizers as waves without the dot"
tool_tip="Hides the voice dot over avatars and shows only voice waves."
layout="topleft"
left="35"
name="FSShowVoiceVisualizerAsWavesOnly"
top_pad="3"
width="237"/>
<check_box
enabled_control="EnableVoiceChat"
control_name="ShowVoiceVisualizersInCalls"

1
indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
View File

@ -106,6 +106,7 @@
<check_box label="Poruszaj ustami awatara podczas mówienia" name="enable_lip_sync"/>
<check_box label="Pokazuj wskaźniki dźwięku ponad awatarami" tool_tip="Pokazuj wskaźniki dźwięku (białe kropki) ponad awatarami" name="FSShowVoiceVisualizer"/>
<check_box label="Pokazuj wskaźniki dźwięku ponad moim własnym awatarem" name="FSShowMyOwnVoiceVisualizer" />
<check_box label="Pokazuj wskaźniki dźwięku bez kropki" tool_tip="Ukrywa kropkę głosu nad awatarami i pokazuje tylko fale głosowe." name="FSShowVoiceVisualizerAsWavesOnly" />
<check_box label="Pokazuj wskaźniki dźwięku w rozmowach prywatnych i grupowych" tool_tip="Pokazuj wskaźniki dźwięku i poruszaj ustami awatara w świecie, gdy rozmawiasz w rozmowach prywatnych lub grupowych" name="Show_Voice_Visualizers_In_Calls"/>
<check_box label="Pokazuj status kanału głosu na kartach rozmów" tool_tip="Pokazuje obecny status kanału głosu na kartach znajdujących się w oknie z listą wszystkich rozmów" name="FSShowConversationVoiceStateIndicator"/>
<check_box label="Automatycznie odrzucaj zaproszenia grupowych rozmów głosowych" name="VoiceCallsRejectGroup"/>