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

15 files changed, 0 insertions, 250 deletions

diff --git a/indra/newview/skins/default/xui/es/floater_chat_bar.xml b/indra/newview/skins/default/xui/es/floater_chat_bar.xml
deleted file mode 100644
index 02369c9a43..0000000000
--- a/indra/newview/skins/default/xui/es/floater_chat_bar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="CHAT">
-	<panel name="bottom_panel">
-		<line_editor label="Pulsa aquí para chatear." name="chat_box" tool_tip="Pulsa Enter para decirlo o Ctrl+Enter para gritarlo"/>
-		<button name="show_nearby_chat" tool_tip="Muestra o esconde el registro del chat"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_perm_prefs.xml b/indra/newview/skins/default/xui/es/floater_perm_prefs.xml
deleted file mode 100644
index 93e2088aba..0000000000
--- a/indra/newview/skins/default/xui/es/floater_perm_prefs.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="PERMISOS POR DEFECTO DE SUBIDA">
-	<panel label="Permisos" name="permissions">
-		<button label="?" label_selected="?" name="help"/>
-		<check_box label="Compartir con el grupo" name="share_with_group"/>
-		<check_box label="Permitir a cualquiera que lo copie" name="everyone_copy"/>
-		<text name="NextOwnerLabel">
-			El próximo propietario puede:
-		</text>
-		<check_box label="Modificarlo" name="next_owner_modify"/>
-		<check_box label="Copiarlo" name="next_owner_copy"/>
-		<check_box label="Revenderlo/Darlo" 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/es/floater_voice_controls.xml b/indra/newview/skins/default/xui/es/floater_voice_controls.xml
deleted file mode 100644
index eff21239be..0000000000
--- a/indra/newview/skins/default/xui/es/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 LA VOZ">
-	<string name="title_nearby">
-		CONFIGURACIÓN DE VOZ
-	</string>
-	<string name="title_group">
-		MULTICONFERENCIA DE VOZ CON [GROUP]
-	</string>
-	<string name="title_adhoc">
-		MULTICONFERENCIA DE VOZ
-	</string>
-	<string name="title_peer_2_peer">
-		LLAMADA A [NAME]
-	</string>
-	<string name="no_one_near">
-		Nadie cercano tiene activada la voz
-	</string>
-	<layout_stack name="my_call_stack">
-		<layout_panel name="my_panel">
-			<text name="user_text" value="Mi 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="Colgar" name="leave_call_btn"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml
deleted file mode 100644
index 82fc8ddd39..0000000000
--- a/indra/newview/skins/default/xui/es/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 el perfil" name="view_profile"/>
-	<menu_item_call label="Añadir como amigo" name="add_friend"/>
-	<menu_item_call label="MI" name="im"/>
-	<menu_item_call label="Llamada" name="call"/>
-	<menu_item_call label="Teleportar" name="teleport"/>
-	<menu_item_call label="Invitar al grupo" name="invite_to_group"/>
-	<menu_item_call label="Ignorar" name="block"/>
-	<menu_item_call label="Designorar" name="unblock"/>
-	<menu_item_call label="Denunciar" name="report"/>
-	<menu_item_call label="Congelar" name="freeze"/>
-	<menu_item_call label="Expulsar" name="eject"/>
-	<menu_item_call label="Expulsar" name="kick"/>
-	<menu_item_call label="CSR" name="csr"/>
-	<menu_item_call label="Depurar las texturas" name="debug"/>
-	<menu_item_call label="Encontrar en el mapa" name="find_on_map"/>
-	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
-	<menu_item_call label="Pagar" name="pay"/>
-	<menu_item_call label="Compartir" name="share"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml
deleted file mode 100644
index 29ad718fdd..0000000000
--- a/indra/newview/skins/default/xui/es/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="Sentarme" name="Sit Down Here"/>
-	<menu_item_call label="Levantarme" name="Stand Up"/>
-	<context_menu label="Quitarme" name="Take Off &gt;">
-		<context_menu label="Ropas" name="Clothes &gt;">
-			<menu_item_call label="Camisa" name="Shirt"/>
-			<menu_item_call label="Pantalones" name="Pants"/>
-			<menu_item_call label="Falda" name="Skirt"/>
-			<menu_item_call label="Zapatos" name="Shoes"/>
-			<menu_item_call label="Calcetines" name="Socks"/>
-			<menu_item_call label="Chaqueta" name="Jacket"/>
-			<menu_item_call label="Guantes" name="Gloves"/>
-			<menu_item_call label="Camiseta" name="Self Undershirt"/>
-			<menu_item_call label="Ropa interior" name="Self Underpants"/>
-			<menu_item_call label="Tatuaje" name="Self Tattoo"/>
-			<menu_item_call label="Alfa" name="Self Alpha"/>
-			<menu_item_call label="Toda la ropa" name="All Clothes"/>
-		</context_menu>
-		<context_menu label="HUD" name="Object Detach HUD"/>
-		<context_menu label="Quitar" name="Object Detach"/>
-		<menu_item_call label="Quitarse todo" name="Detach All"/>
-	</context_menu>
-	<menu_item_call label="Cambiar vestuario" name="Chenge Outfit"/>
-	<menu_item_call label="Editar mi vestuario" name="Edit Outfit"/>
-	<menu_item_call label="Editar mi anatomía" name="Edit My Shape"/>
-	<menu_item_call label="Mis amigos" name="Friends..."/>
-	<menu_item_call label="Mis grupos" name="Groups..."/>
-	<menu_item_call label="Mi perfil" name="Profile..."/>
-	<menu_item_call label="Depurar las texturas" name="Debug..."/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_name_field.xml b/indra/newview/skins/default/xui/es/menu_name_field.xml
deleted file mode 100644
index 0d51fbffeb..0000000000
--- a/indra/newview/skins/default/xui/es/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="Copiar Nombre mostrado" name="copy_display"/>
-	<menu_item_call label="Copiar Nombre de agente" name="copy_name"/>
-	<menu_item_call label="Copiar ID de agente" name="copy_id"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml
deleted file mode 100644
index 3899ad9e96..0000000000
--- a/indra/newview/skins/default/xui/es/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 alfabéticamente" name="sort_name"/>
-	<menu_item_check label="Ordenar por estatus" name="sort_status"/>
-	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
-	<menu_item_check label="Ver permisos concedidos" name="view_permissions"/>
-	<menu_item_call label="Ver la lista de Residentes y Objetos ignorados" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml
deleted file mode 100644
index 1bd3efb611..0000000000
--- a/indra/newview/skins/default/xui/es/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 los iconos de grupo" name="Display Group Icons"/>
-	<menu_item_call label="Dejar el grupo seleccionado" name="Leave Selected Group"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml
deleted file mode 100644
index 1403e4db01..0000000000
--- a/indra/newview/skins/default/xui/es/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 según las intervenciones recientes" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
-	<menu_item_check label="Ordenar según distancia" name="sort_distance"/>
-	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
-	<menu_item_check label="Ver mapa" name="view_map"/>
-	<menu_item_call label="Ver la lista de Residentes y Objetos ignorados" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml
deleted file mode 100644
index e4aaa89110..0000000000
--- a/indra/newview/skins/default/xui/es/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 los más recientes" name="sort_most"/>
-	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
-	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
-	<menu_item_call label="Ver la lista de Residentes y Objetos ignorados" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml
deleted file mode 100644
index c64a93e0e5..0000000000
--- a/indra/newview/skins/default/xui/es/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="Llamar" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Colgar" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Controles de la voz" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_facebook_account.xml b/indra/newview/skins/default/xui/es/panel_facebook_account.xml
deleted file mode 100644
index 2b6d407ad7..0000000000
--- a/indra/newview/skins/default/xui/es/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="Estás conectado a Facebook como:"/>
-	<string name="facebook_disconnected" value="No conectado a Facebook"/>
-	<text name="account_caption_label">
-		No conectado a 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 Aprende a publicar en Facebook]
-		</text>
-	</panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_control_panel.xml b/indra/newview/skins/default/xui/es/panel_group_control_panel.xml
deleted file mode 100644
index b398293175..0000000000
--- a/indra/newview/skins/default/xui/es/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 del grupo" name="group_info_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Llamar al grupo" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Colgar" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Abrir los controles de la voz" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
deleted file mode 100644
index f218324d50..0000000000
--- a/indra/newview/skins/default/xui/es/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="Añadir como amigo" name="add_friend_btn"/>
-		</layout_panel>
-		<layout_panel name="teleport_btn_panel">
-			<button label="Teleportar" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/>
-		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="Compartir" 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="Llamar" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Colgar" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Controles de la voz" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_profile_interests.xml b/indra/newview/skins/default/xui/es/panel_profile_interests.xml
deleted file mode 100644
index 86dd63390c..0000000000
--- a/indra/newview/skins/default/xui/es/panel_profile_interests.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Intereses" name="panel_profile_interests">
-	<text name="I Want To:">
-		Quiero:
-	</text>
-	<check_box label="Construye" name="chk0"/>
-	<check_box label="Explora" name="chk1"/>
-	<check_box label="Conoce" name="chk2"/>
-	<check_box label="Encuentra empleo" name="chk6"/>
-	<check_box label="Agrupa" name="chk3"/>
-	<check_box label="Compra" name="chk4"/>
-	<check_box label="Vende" name="chk5"/>
-	<check_box label="Contrata" name="chk7"/>
-	<line_editor name="want_to_edit">
-		(cargando...)
-	</line_editor>
-	<text name="Skills:">
-		Habilidades:
-	</text>
-	<check_box label="Texturas" name="schk0"/>
-	<check_box label="Arquitectura" name="schk1"/>
-	<check_box label="Modelo" name="schk3"/>
-	<check_box label="Planificación de eventos" name="schk2"/>
-	<check_box label="Preparación de scripts" name="schk4"/>
-	<check_box label="Personajes personalizados" name="schk5"/>
-	<line_editor name="skills_edit">
-		(cargando...)
-	</line_editor>
-	<text name="Languages:">
-		Idiomas:
-	</text>
-	<line_editor name="languages_edit">
-		(cargando...)
-	</line_editor>
-</panel>