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, 251 deletions

diff --git a/indra/newview/skins/default/xui/de/floater_chat_bar.xml b/indra/newview/skins/default/xui/de/floater_chat_bar.xml
deleted file mode 100644
index ab77d4dae5..0000000000
--- a/indra/newview/skins/default/xui/de/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 IN DER NÄHE">
-	<panel name="bottom_panel">
-		<line_editor label="Zum Chatten hier klicken." name="chat_box" tool_tip="Eingabetaste zum Sprechen, Strg+Eingabe zum Rufen"/>
-		<button name="show_nearby_chat" tool_tip="Chatprotokoll in der Nähe ein-/ausblenden"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_perm_prefs.xml b/indra/newview/skins/default/xui/de/floater_perm_prefs.xml
deleted file mode 100644
index 9be22f3ccb..0000000000
--- a/indra/newview/skins/default/xui/de/floater_perm_prefs.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="STANDARD-BERECHTIGUNGEN FÜR HOCHLADEN">
-	<panel label="Berechtigungen" name="permissions">
-		<button label="?" label_selected="?" name="help"/>
-		<check_box label="Mit Gruppe teilen" name="share_with_group"/>
-		<check_box label="Kopieren allen erlauben" name="everyone_copy"/>
-		<text name="NextOwnerLabel">
-			Nächster Eigentümer kann:
-		</text>
-		<check_box label="Bearbeiten" name="next_owner_modify"/>
-		<check_box label="Kopieren" name="next_owner_copy"/>
-		<check_box label="Verkaufen/Weggeben" name="next_owner_transfer"/>
-	</panel>
-	<button label="OK" label_selected="OK" name="ok"/>
-	<button label="Abbrechen" label_selected="Abbrechen" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_controls.xml b/indra/newview/skins/default/xui/de/floater_voice_controls.xml
deleted file mode 100644
index 5efda4136e..0000000000
--- a/indra/newview/skins/default/xui/de/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="SPRACHSTEUERUNGEN">
-	<string name="title_nearby">
-		VOICE-EINSTELLUNGEN
-	</string>
-	<string name="title_group">
-		GRUPPENGESPRÄCH MIT [GROUP]
-	</string>
-	<string name="title_adhoc">
-		KONFERENZGESPRÄCH
-	</string>
-	<string name="title_peer_2_peer">
-		GESPRÄCH MIT [NAME]
-	</string>
-	<string name="no_one_near">
-		Es ist niemand in der Nähe, der Voice aktiviert hat.
-	</string>
-	<layout_stack name="my_call_stack">
-		<layout_panel name="my_panel">
-			<text name="user_text" value="Mein 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="Anruf beenden" name="leave_call_btn"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml
deleted file mode 100644
index 641a0ceebe..0000000000
--- a/indra/newview/skins/default/xui/de/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="Profil anzeigen" name="view_profile"/>
-	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Anrufen" name="call"/>
-	<menu_item_call label="Teleportieren" name="teleport"/>
-	<menu_item_call label="In Gruppe einladen" name="invite_to_group"/>
-	<menu_item_call label="Ignorieren" name="block"/>
-	<menu_item_call label="Freischalten" name="unblock"/>
-	<menu_item_call label="Melden" name="report"/>
-	<menu_item_call label="Einfrieren" name="freeze"/>
-	<menu_item_call label="Hinauswerfen" name="eject"/>
-	<menu_item_call label="Hinauswerfen" name="kick"/>
-	<menu_item_call label="CSR" name="csr"/>
-	<menu_item_call label="Fehler in Texturen beseitigen" name="debug"/>
-	<menu_item_call label="Auf Karte anzeigen" name="find_on_map"/>
-	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
-	<menu_item_call label="Bezahlen" name="pay"/>
-	<menu_item_call label="Teilen" name="share"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
deleted file mode 100644
index 5979194bfb..0000000000
--- a/indra/newview/skins/default/xui/de/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="Hinsetzen" name="Sit Down Here"/>
-	<menu_item_call label="Aufstehen" name="Stand Up"/>
-	<context_menu label="Ausziehen" name="Take Off &gt;">
-		<context_menu label="Kleidung" name="Clothes &gt;">
-			<menu_item_call label="Hemd" name="Shirt"/>
-			<menu_item_call label="Hose" name="Pants"/>
-			<menu_item_call label="Rock" name="Skirt"/>
-			<menu_item_call label="Schuhe" name="Shoes"/>
-			<menu_item_call label="Strümpfe" name="Socks"/>
-			<menu_item_call label="Jacke" name="Jacket"/>
-			<menu_item_call label="Handschuhe" name="Gloves"/>
-			<menu_item_call label="Unterhemd" name="Self Undershirt"/>
-			<menu_item_call label="Unterhose" name="Self Underpants"/>
-			<menu_item_call label="Tätowierung" name="Self Tattoo"/>
-			<menu_item_call label="Alpha" name="Self Alpha"/>
-			<menu_item_call label="Alle Kleider" name="All Clothes"/>
-		</context_menu>
-		<context_menu label="HUD" name="Object Detach HUD"/>
-		<context_menu label="Abnehmen" name="Object Detach"/>
-		<menu_item_call label="Alles abnehmen" name="Detach All"/>
-	</context_menu>
-	<menu_item_call label="Outfit ändern" name="Chenge Outfit"/>
-	<menu_item_call label="Mein Outfit bearbeiten" name="Edit Outfit"/>
-	<menu_item_call label="Meine Form bearbeiten" name="Edit My Shape"/>
-	<menu_item_call label="Meine Freunde" name="Friends..."/>
-	<menu_item_call label="Meine Gruppen" name="Groups..."/>
-	<menu_item_call label="Mein Profil" name="Profile..."/>
-	<menu_item_call label="Fehler in Texturen beseitigen" name="Debug..."/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_name_field.xml b/indra/newview/skins/default/xui/de/menu_name_field.xml
deleted file mode 100644
index 1d293c9361..0000000000
--- a/indra/newview/skins/default/xui/de/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="Anzeigenamen kopieren" name="copy_display"/>
-	<menu_item_call label="Agent-Namen kopieren" name="copy_name"/>
-	<menu_item_call label="Agent-ID kopieren" name="copy_id"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml
deleted file mode 100644
index 84d9d8938c..0000000000
--- a/indra/newview/skins/default/xui/de/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="Nach Name sortieren" name="sort_name"/>
-	<menu_item_check label="Nach Status sortieren" name="sort_status"/>
-	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
-	<menu_item_check label="Erteilte Genehmigungen anzeigen" name="view_permissions"/>
-	<menu_item_call label="Ignorierte Einwohner &amp; Objekte anzeigen" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml
deleted file mode 100644
index b68597d8aa..0000000000
--- a/indra/newview/skins/default/xui/de/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="Gruppensymbole anzeigen" name="Display Group Icons"/>
-	<menu_item_call label="Ausgewählte Gruppe verlassen" name="Leave Selected Group"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml
deleted file mode 100644
index a001544f3e..0000000000
--- a/indra/newview/skins/default/xui/de/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="Nach letzten Sprechern sortieren" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Nach Name sortieren" name="sort_name"/>
-	<menu_item_check label="Nach Entfernung sortieren" name="sort_distance"/>
-	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
-	<menu_item_check label="Karte anzeigen" name="view_map"/>
-	<menu_item_call label="Ignorierte Einwohner &amp; Objekte anzeigen" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml
deleted file mode 100644
index 1ef020f5e1..0000000000
--- a/indra/newview/skins/default/xui/de/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="Nach aktuellesten Sprechern sortieren" name="sort_most"/>
-	<menu_item_check label="Nach Name sortieren" name="sort_name"/>
-	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
-	<menu_item_call label="Ignorierte Einwohner &amp; Objekte anzeigen" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml
deleted file mode 100644
index 6ad18781f5..0000000000
--- a/indra/newview/skins/default/xui/de/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="Anrufen" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Anruf beenden" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Voice-Steuerung" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_facebook_account.xml b/indra/newview/skins/default/xui/de/panel_facebook_account.xml
deleted file mode 100644
index caa5f55186..0000000000
--- a/indra/newview/skins/default/xui/de/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="Sie sind mit Facebook verbunden als:"/>
-	<string name="facebook_disconnected" value="Nicht mit Facebook verbunden"/>
-	<text name="account_caption_label">
-		Nicht mit Facebook verbunden.
-	</text>
-	<panel name="panel_buttons">
-		<button label="Verbinden..." name="connect_btn"/>
-		<button label="Trennen" name="disconnect_btn"/>
-		<text name="account_learn_more_label">
-			[http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Anweisungen zum Posten auf Facebook]
-		</text>
-	</panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_control_panel.xml b/indra/newview/skins/default/xui/de/panel_group_control_panel.xml
deleted file mode 100644
index 9cb72fafff..0000000000
--- a/indra/newview/skins/default/xui/de/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="Gruppenprofil" name="group_info_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Gruppe anrufen" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Anruf beenden" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Voice-Steuerung öffnen" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml
deleted file mode 100644
index abf8011d9d..0000000000
--- a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<text name="avatar_name" value="Unbekannt"/>
-	<layout_stack name="button_stack">
-		<layout_panel name="view_profile_btn_panel">
-			<button label="Profil" name="view_profile_btn"/>
-		</layout_panel>
-		<layout_panel name="add_friend_btn_panel">
-			<button label="Freund hinzufügen" name="add_friend_btn"/>
-		</layout_panel>
-		<layout_panel name="teleport_btn_panel">
-			<button label="Teleportieren" name="teleport_btn" tool_tip="Dieser Person einen Teleport anbieten."/>
-		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="Teilen" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="Bezahlen" name="pay_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Anrufen" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Anruf beenden" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Voice-Steuerung" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_profile_interests.xml b/indra/newview/skins/default/xui/de/panel_profile_interests.xml
deleted file mode 100644
index 0f36f76aa0..0000000000
--- a/indra/newview/skins/default/xui/de/panel_profile_interests.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Interessen" name="panel_profile_interests">
-	<text name="I Want To:">
-		Ich möchte:
-	</text>
-	<check_box label="Erstellen" name="chk0"/>
-	<check_box label="Erkunden" name="chk1"/>
-	<check_box label="Treffen" name="chk2"/>
-	<check_box label="Angestellt werden" name="chk6"/>
-	<check_box label="Gruppe" name="chk3"/>
-	<check_box label="Kaufen" name="chk4"/>
-	<check_box label="Verkaufen" name="chk5"/>
-	<check_box label="Anstellen" name="chk7"/>
-	<line_editor name="want_to_edit">
-		(wird geladen...)
-	</line_editor>
-	<text name="Skills:">
-		Fähigkeiten:
-	</text>
-	<check_box label="Texturen" name="schk0"/>
-	<check_box label="Architektur" name="schk1"/>
-	<check_box label="Modellierung" name="schk3"/>
-	<check_box label="Eventplanung" name="schk2"/>
-	<check_box label="Scripting" name="schk4"/>
-	<check_box label="Benutzerdefinierte Charaktere" name="schk5"/>
-	<line_editor name="skills_edit">
-		(wird geladen...)
-	</line_editor>
-	<text name="Languages:">
-		Sprachen:
-	</text>
-	<line_editor name="languages_edit">
-		(wird geladen...)
-	</line_editor>
-</panel>