diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-24 01:23:52 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-24 01:23:52 +0300 |
| commit | 7373fd91fa42b3fce0804ccd10899a5d1fdb5c36 (patch) | |
| tree | 54a107f3415c04e6e493f54e156c3ac278d36f99 /indra/newview/skins/default/xui/pt/floater_voice_controls.xml | |
| parent | 264d9c32d9e04df0ceeaf2a63f6872aad29dd46a (diff) | |
| parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-489
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/llxml/llcontrol.cpp
# indra/newview/llpanelnearbymedia.cpp
# indra/newview/llsceneview.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
Diffstat (limited to 'indra/newview/skins/default/xui/pt/floater_voice_controls.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/pt/floater_voice_controls.xml | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml deleted file mode 100644 index 745a7d0e00..0000000000 --- a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_voice_controls" title="CONTROLES DE VOZ"> - <string name="title_nearby"> - CONFIGURAÇÕES DE VOZ - </string> - <string name="title_group"> - LIGAÇÃO DE GRUPO COM [GROUP] - </string> - <string name="title_adhoc"> - TELECONFERÊNCIA - </string> - <string name="title_peer_2_peer"> - LIGAÇÃO PARA [NAME] - </string> - <string name="no_one_near"> - Ninguém por perto ativou a voz - </string> - <layout_stack name="my_call_stack"> - <layout_panel name="my_panel"> - <text name="user_text" value="Meu avatar:"/> - </layout_panel> - <layout_panel name="leave_call_panel"> - <layout_stack name="voice_effect_and_leave_call_stack"> - <layout_panel name="leave_call_btn_panel"> - <button label="Desligar" name="leave_call_btn"/> - </layout_panel> - </layout_stack> - </layout_panel> - </layout_stack> -</floater> |