Merge branch main (DRTVWR-582) into DRTVWR-567

# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventoryobserver.cpp
#	indra/newview/llinventoryobserver.h
#	indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml

15 files changed, 0 insertions, 250 deletions

diff --git a/indra/newview/skins/default/xui/pt/floater_chat_bar.xml b/indra/newview/skins/default/xui/pt/floater_chat_bar.xml
deleted file mode 100644
index 2eb2c94940..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_chat_bar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="BATE-PAPO LOCAL">
-	<panel name="bottom_panel">
-		<line_editor label="Clique aqui para bater papo." name="chat_box" tool_tip="Tecle Enter para falar, Ctrl+Enter para gritar"/>
-		<button name="show_nearby_chat" tool_tip="Mostra/oculta o histórico do bate-papo local"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml
deleted file mode 100644
index 33a0d6a456..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="PERMISSÕES PADRÃO DE UPLOAD">
-	<panel label="Permissões" name="permissions">
-		<button label="?" label_selected="?" name="help"/>
-		<check_box label="Compartilhar com o grupo" name="share_with_group"/>
-		<check_box label="Permitir que qualquer um copie" name="everyone_copy"/>
-		<text name="NextOwnerLabel">
-			O próximo dono pode:
-		</text>
-		<check_box label="Modificar" name="next_owner_modify"/>
-		<check_box label="Copiar" name="next_owner_copy"/>
-		<check_box label="Revender/Dar" name="next_owner_transfer"/>
-	</panel>
-	<button label="OK" label_selected="OK" name="ok"/>
-	<button label="Cancelar" label_selected="Cancelar" name="cancel"/>
-</floater>
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>
diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml
deleted file mode 100644
index 2b5aa7508b..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="Ver perfil" name="view_profile"/>
-	<menu_item_call label="Adicionar amigo..." name="add_friend"/>
-	<menu_item_call label="MI" name="im"/>
-	<menu_item_call label="Ligar" name="call"/>
-	<menu_item_call label="Teletransportar" name="teleport"/>
-	<menu_item_call label="Convidar para entrar no grupo" name="invite_to_group"/>
-	<menu_item_call label="Bloquear" name="block"/>
-	<menu_item_call label="Desbloquear" name="unblock"/>
-	<menu_item_call label="Denunciar" name="report"/>
-	<menu_item_call label="Congelar" name="freeze"/>
-	<menu_item_call label="Ejetar" name="eject"/>
-	<menu_item_call label="Chutar" name="kick"/>
-	<menu_item_call label="CSR" name="csr"/>
-	<menu_item_call label="Depurar texturas" name="debug"/>
-	<menu_item_call label="Localizar no mapa" name="find_on_map"/>
-	<menu_item_call label="Mais zoom" name="zoom_in"/>
-	<menu_item_call label="Pagar" name="pay"/>
-	<menu_item_call label="Compartilhar" name="share"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
deleted file mode 100644
index e8fafa58a9..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="Sentar" name="Sit Down Here"/>
-	<menu_item_call label="Ficar de pé" name="Stand Up"/>
-	<context_menu label="Tirar" name="Take Off &gt;">
-		<context_menu label="Roupa" name="Clothes &gt;">
-			<menu_item_call label="Camisa" name="Shirt"/>
-			<menu_item_call label="Calças" name="Pants"/>
-			<menu_item_call label="Saia" name="Skirt"/>
-			<menu_item_call label="Sapatos" name="Shoes"/>
-			<menu_item_call label="Meias" name="Socks"/>
-			<menu_item_call label="Jaqueta" name="Jacket"/>
-			<menu_item_call label="Luvas" name="Gloves"/>
-			<menu_item_call label="Camiseta" name="Self Undershirt"/>
-			<menu_item_call label="Roupa de baixo" name="Self Underpants"/>
-			<menu_item_call label="Tatuagem" name="Self Tattoo"/>
-			<menu_item_call label="Alpha" name="Self Alpha"/>
-			<menu_item_call label="Todas as roupas" name="All Clothes"/>
-		</context_menu>
-		<context_menu label="HUD" name="Object Detach HUD"/>
-		<context_menu label="Separar" name="Object Detach"/>
-		<menu_item_call label="Separar tudo" name="Detach All"/>
-	</context_menu>
-	<menu_item_call label="Trocar de look" name="Chenge Outfit"/>
-	<menu_item_call label="Editar meu look" name="Edit Outfit"/>
-	<menu_item_call label="Editar meu corpo" name="Edit My Shape"/>
-	<menu_item_call label="Meus amigos" name="Friends..."/>
-	<menu_item_call label="Meus grupos" name="Groups..."/>
-	<menu_item_call label="Meu perfil" name="Profile..."/>
-	<menu_item_call label="Depurar texturas" name="Debug..."/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_name_field.xml b/indra/newview/skins/default/xui/pt/menu_name_field.xml
deleted file mode 100644
index 2157de9813..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_name_field.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="CopyMenu">
-	<menu_item_call label="Exibir Cópia do Nome" name="copy_display"/>
-	<menu_item_call label="Copiar Nome do Agente" name="copy_name"/>
-	<menu_item_call label="Copiar Id do Agente" name="copy_id"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml
deleted file mode 100644
index e7c325010f..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Ordenar por nome" name="sort_name"/>
-	<menu_item_check label="Ordenar por status" name="sort_status"/>
-	<menu_item_check label="Ver ícones de pessoas" name="view_icons"/>
-	<menu_item_check label="Autorizações de visualização dadas" name="view_permissions"/>
-	<menu_item_call label="Ver residentes e objetos bloqueados" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml
deleted file mode 100644
index 86a9d2263f..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Mostrar ícones de grupos" name="Display Group Icons"/>
-	<menu_item_call label="Sair do grupo selecionado" name="Leave Selected Group"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml
deleted file mode 100644
index 0d32d58de4..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordenar por conversas mais recentes" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Ordenar por nome" name="sort_name"/>
-	<menu_item_check label="Ordenar por distância" name="sort_distance"/>
-	<menu_item_check label="Ver ícones de pessoas" name="view_icons"/>
-	<menu_item_check label="Ver Mapa" name="view_map"/>
-	<menu_item_call label="Ver residentes e objetos bloqueados" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml
deleted file mode 100644
index f3b89e01cd..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Ordenar por mais recente" name="sort_most"/>
-	<menu_item_check label="Ordenar por nome" name="sort_name"/>
-	<menu_item_check label="Ver ícones de pessoas" name="view_icons"/>
-	<menu_item_call label="Ver residentes e objetos bloqueados" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml
deleted file mode 100644
index bd50d4953d..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="call_btn_panel">
-			<button label="Ligar" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Desligar" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Controles de voz" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_facebook_account.xml b/indra/newview/skins/default/xui/pt/panel_facebook_account.xml
deleted file mode 100644
index b449e7959d..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_facebook_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_account">
-	<string name="facebook_connected" value="Você está conectado ao Facebook como:"/>
-	<string name="facebook_disconnected" value="Não conectado ao Facebook"/>
-	<text name="account_caption_label">
-		Não conectado ao Facebook.
-	</text>
-	<panel name="panel_buttons">
-		<button label="Conectar..." name="connect_btn"/>
-		<button label="Desconectar" name="disconnect_btn"/>
-		<text name="account_learn_more_label">
-			[http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Aprenda a publicar no Facebook]
-		</text>
-	</panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml
deleted file mode 100644
index 502dae8d67..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="group_info_btn_panel">
-			<button label="Perfil do grupo" name="group_info_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Ligar para o grupo" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Desligar" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Abrir controles de voz" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml
deleted file mode 100644
index 91b7d1b7cd..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="button_stack">
-		<layout_panel name="view_profile_btn_panel">
-			<button label="Perfil" name="view_profile_btn"/>
-		</layout_panel>
-		<layout_panel name="add_friend_btn_panel">
-			<button label="Adicionar amigo" name="add_friend_btn"/>
-		</layout_panel>
-		<layout_panel name="teleport_btn_panel">
-			<button label="Teletransportar" name="teleport_btn" tool_tip="Oferecer teletransporte"/>
-		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="Compartilhar" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="Pagar" name="pay_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Ligar" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Encerrar ligação" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Controles de voz" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_profile_interests.xml b/indra/newview/skins/default/xui/pt/panel_profile_interests.xml
deleted file mode 100644
index edf74115f2..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_profile_interests.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Interesses" name="panel_profile_interests">
-	<text name="I Want To:">
-		Quero:
-	</text>
-	<check_box label="Crie" name="chk0"/>
-	<check_box label="Explore" name="chk1"/>
-	<check_box label="Encontrar" name="chk2"/>
-	<check_box label="Seja contratado" name="chk6"/>
-	<check_box label="Grupo" name="chk3"/>
-	<check_box label="Comprar" name="chk4"/>
-	<check_box label="Venda" name="chk5"/>
-	<check_box label="Contratar" name="chk7"/>
-	<line_editor name="want_to_edit">
-		(carregando...)
-	</line_editor>
-	<text name="Skills:">
-		Habilidades:
-	</text>
-	<check_box label="Texturas" name="schk0"/>
-	<check_box label="Arquitetura" name="schk1"/>
-	<check_box label="Modelo" name="schk3"/>
-	<check_box label="Planejamento de evento" name="schk2"/>
-	<check_box label="Scripts" name="schk4"/>
-	<check_box label="Personagens personalizados" name="schk5"/>
-	<line_editor name="skills_edit">
-		(carregando...)
-	</line_editor>
-	<text name="Languages:">
-		Idiomas:
-	</text>
-	<line_editor name="languages_edit">
-		(carregando...)
-	</line_editor>
-</panel>