From 190fc730f061750c2877678e838d3d5f5a5c6c1a Mon Sep 17 00:00:00 2001
From: eli <eli@lindenlab.com>
Date: Sun, 26 May 2019 03:15:34 -0700
Subject: [PATCH 01/97] FIX INTL-351 translation update for 9 languages for
 viewer-lynx

---
 .../default/xui/de/floater_about_land.xml     | 32 +++++++++++++------
 .../default/xui/de/floater_ban_duration.xml   | 19 +++++++++++
 .../skins/default/xui/de/floater_gesture.xml  |  4 +--
 .../floater_preferences_graphics_advanced.xml |  1 +
 .../xui/de/floater_preview_notecard.xml       |  1 +
 .../default/xui/de/floater_report_abuse.xml   |  2 +-
 .../skins/default/xui/de/notifications.xml    |  2 +-
 .../default/xui/de/panel_group_general.xml    |  2 +-
 .../default/xui/de/panel_region_access.xml    |  5 ++-
 .../default/xui/de/panel_region_estate.xml    |  2 +-
 .../newview/skins/default/xui/de/strings.xml  | 18 +++++++----
 .../default/xui/es/floater_about_land.xml     | 30 +++++++++++------
 .../default/xui/es/floater_ban_duration.xml   | 19 +++++++++++
 .../skins/default/xui/es/floater_gesture.xml  |  4 +--
 .../floater_preferences_graphics_advanced.xml |  1 +
 .../xui/es/floater_preview_notecard.xml       |  1 +
 .../skins/default/xui/es/notifications.xml    |  2 +-
 .../default/xui/es/panel_group_general.xml    |  2 +-
 .../default/xui/es/panel_region_access.xml    |  3 ++
 .../newview/skins/default/xui/es/strings.xml  | 18 +++++++----
 .../default/xui/fr/floater_about_land.xml     | 30 +++++++++++------
 .../default/xui/fr/floater_ban_duration.xml   | 19 +++++++++++
 .../skins/default/xui/fr/floater_gesture.xml  |  4 +--
 .../floater_preferences_graphics_advanced.xml |  1 +
 .../xui/fr/floater_preview_notecard.xml       |  1 +
 .../skins/default/xui/fr/notifications.xml    |  8 ++---
 .../default/xui/fr/panel_group_general.xml    |  2 +-
 .../default/xui/fr/panel_region_access.xml    |  5 ++-
 .../newview/skins/default/xui/fr/strings.xml  | 18 +++++++----
 .../default/xui/it/floater_about_land.xml     | 32 +++++++++++++------
 .../default/xui/it/floater_ban_duration.xml   | 19 +++++++++++
 .../skins/default/xui/it/floater_gesture.xml  |  4 +--
 .../floater_preferences_graphics_advanced.xml |  1 +
 .../xui/it/floater_preview_notecard.xml       |  1 +
 .../default/xui/it/floater_report_abuse.xml   |  2 +-
 .../skins/default/xui/it/notifications.xml    |  4 +--
 .../default/xui/it/panel_group_general.xml    |  2 +-
 .../default/xui/it/panel_region_access.xml    | 13 +++++---
 .../newview/skins/default/xui/it/strings.xml  | 18 +++++++----
 .../default/xui/ja/floater_about_land.xml     | 32 +++++++++++++------
 .../default/xui/ja/floater_ban_duration.xml   | 19 +++++++++++
 .../skins/default/xui/ja/floater_gesture.xml  |  4 +--
 .../floater_preferences_graphics_advanced.xml |  1 +
 .../xui/ja/floater_preview_notecard.xml       |  1 +
 .../default/xui/ja/floater_report_abuse.xml   |  2 +-
 .../default/xui/ja/panel_group_general.xml    |  2 +-
 .../default/xui/ja/panel_region_access.xml    |  3 ++
 .../newview/skins/default/xui/ja/strings.xml  | 18 +++++++----
 .../default/xui/pt/floater_about_land.xml     | 30 +++++++++++------
 .../default/xui/pt/floater_ban_duration.xml   | 19 +++++++++++
 .../skins/default/xui/pt/floater_gesture.xml  |  4 +--
 .../floater_preferences_graphics_advanced.xml |  1 +
 .../xui/pt/floater_preview_notecard.xml       |  1 +
 .../default/xui/pt/floater_report_abuse.xml   |  2 +-
 .../skins/default/xui/pt/notifications.xml    |  2 +-
 .../default/xui/pt/panel_group_general.xml    |  2 +-
 .../default/xui/pt/panel_region_access.xml    |  3 ++
 .../newview/skins/default/xui/pt/strings.xml  | 18 +++++++----
 .../default/xui/ru/floater_about_land.xml     | 30 +++++++++++------
 .../default/xui/ru/floater_ban_duration.xml   | 19 +++++++++++
 .../skins/default/xui/ru/floater_gesture.xml  |  4 +--
 .../floater_preferences_graphics_advanced.xml |  1 +
 .../xui/ru/floater_preview_notecard.xml       |  1 +
 .../default/xui/ru/floater_report_abuse.xml   |  2 +-
 .../default/xui/ru/panel_group_general.xml    |  2 +-
 .../default/xui/ru/panel_region_access.xml    |  3 ++
 .../default/xui/ru/panel_region_estate.xml    |  2 +-
 .../newview/skins/default/xui/ru/strings.xml  | 18 +++++++----
 .../default/xui/tr/floater_about_land.xml     | 32 +++++++++++++------
 .../default/xui/tr/floater_ban_duration.xml   | 19 +++++++++++
 .../skins/default/xui/tr/floater_gesture.xml  |  4 +--
 .../floater_preferences_graphics_advanced.xml |  1 +
 .../xui/tr/floater_preview_notecard.xml       |  1 +
 .../default/xui/tr/floater_report_abuse.xml   |  2 +-
 .../default/xui/tr/panel_group_general.xml    |  2 +-
 .../default/xui/tr/panel_region_access.xml    |  3 ++
 .../newview/skins/default/xui/tr/strings.xml  | 18 +++++++----
 .../default/xui/zh/floater_about_land.xml     | 30 +++++++++++------
 .../default/xui/zh/floater_ban_duration.xml   | 19 +++++++++++
 .../skins/default/xui/zh/floater_gesture.xml  |  4 +--
 .../floater_preferences_graphics_advanced.xml |  1 +
 .../xui/zh/floater_preview_notecard.xml       |  1 +
 .../default/xui/zh/floater_report_abuse.xml   |  2 +-
 .../default/xui/zh/panel_group_general.xml    |  2 +-
 .../default/xui/zh/panel_region_access.xml    |  3 ++
 .../newview/skins/default/xui/zh/strings.xml  | 18 +++++++----
 86 files changed, 569 insertions(+), 191 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/de/floater_ban_duration.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_ban_duration.xml
 create mode 100644 indra/newview/skins/default/xui/fr/floater_ban_duration.xml
 create mode 100644 indra/newview/skins/default/xui/it/floater_ban_duration.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_ban_duration.xml
 create mode 100644 indra/newview/skins/default/xui/pt/floater_ban_duration.xml
 create mode 100644 indra/newview/skins/default/xui/ru/floater_ban_duration.xml
 create mode 100644 indra/newview/skins/default/xui/tr/floater_ban_duration.xml
 create mode 100644 indra/newview/skins/default/xui/zh/floater_ban_duration.xml

diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml
index 1e18ab20e8..57a48f7906 100644
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -9,6 +9,12 @@
 	<floater.string name="maturity_icon_adult">
 		&quot;Parcel_R_Dark&quot;
 	</floater.string>
+	<floater.string name="Hours">
+		[HOURS] Stunden
+	</floater.string>
+	<floater.string name="Hour">
+		Std.
+	</floater.string>
 	<floater.string name="Minutes">
 		[MINUTES] Min.
 	</floater.string>
@@ -21,6 +27,9 @@
 	<floater.string name="Remaining">
 		Restzeit
 	</floater.string>
+	<floater.string name="Always">
+		Immer
+	</floater.string>
 	<tab_container name="landtab" tab_min_width="40" width="489">
 		<panel label="ALLGEMEIN" name="land_general_panel">
 			<panel.string name="new users only">
@@ -319,18 +328,18 @@ Nur große Parzellen können in der Suche aufgeführt werden.
 			<text name="allow_label2">
 				Bauen:
 			</text>
-			<check_box label="Jeder" name="edit objects check"/>
-			<check_box label="Gruppe" name="edit group objects check"/>
+			<check_box label="Jeder" name="edit objects check" tool_tip="Wenn aktiviert, können Einwohner auf Ihrem Land Objekte erstellen und rezzen."/>
+			<check_box label="Gruppe" name="edit group objects check" tool_tip="Wenn aktiviert, können Parzellengruppen-Mitglieder auf Ihrem Land Objekte erstellen und rezzen."/>
 			<text name="allow_label3">
 				Objekteintritt:
 			</text>
-			<check_box label="Jeder" name="all object entry check"/>
-			<check_box label="Gruppe" name="group object entry check"/>
+			<check_box label="Jeder" name="all object entry check" tool_tip="Wenn aktiviert, können Einwohner bestehende Objekte von anderen Parzellen auf diese Parzelle verschieben."/>
+			<check_box label="Gruppe" name="group object entry check" tool_tip="Wenn aktiviert, können Parzellengruppen-Mitglieder bestehende Objekte von anderen Parzellen auf diese Parzelle verschieben."/>
 			<text name="allow_label4">
 				Skripts ausführen:
 			</text>
-			<check_box label="Jeder" name="check other scripts"/>
-			<check_box label="Gruppe" name="check group scripts"/>
+			<check_box label="Jeder" name="check other scripts" tool_tip="Wenn aktiviert, können Einwohner auf Ihrer Parzelle Skripte inklusive Anhängen ausführen."/>
+			<check_box label="Gruppe" name="check group scripts" tool_tip="Wenn aktiviert, können Parzellengruppen-Mitglieder auf Ihrer Parzelle Skripte inklusive Anhängen ausführen."/>
 			<check_box label="Sicher (kein Schaden)" name="check safe" tool_tip="Falls aktiviert, wird Land auf Option „Sicher“ eingestellt, Kampfschäden sind deaktiviert. Ansonsten sind Kampfschäden aktiviert."/>
 			<check_box label="Kein Stoßen" name="PushRestrictCheck" tool_tip="Verhindert Stoßen durch Skripte. Durch Aktivieren dieser Option verhindern Sie störendes Verhalten auf Ihrem Land."/>
 			<check_box label="Ort in Suche anzeigen (30 L$/Woche)" name="ShowDirectoryCheck" tool_tip="Diese Parzelle in Suchergebnissen anzeigen."/>
@@ -354,8 +363,8 @@ Nur große Parzellen können in der Suche aufgeführt werden.
 				Foto:
 			</text>
 			<texture_picker label="" name="snapshot_ctrl" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
-			<text name="allow_label5">
-				Avatare in anderen Parzellen können Avatare in dieser Parzelle sehen und mit ihnen chatten
+			<text name="allow_see_label">
+				Avatare in anderen Parzellen können Avatare in dieser Parzelle sehen und mit ihnen chatten.
 			</text>
 			<check_box label="Avatare sehen" name="SeeAvatarsCheck" tool_tip="Gestattet sowohl Avataren auf anderen Parzellen, Avatare auf dieser Parzelle zu sehen und mit ihnen zu chatten, als auch Ihnen, diese Avatare auf anderen Parzellen zu sehen und mit ihnen zu chatten."/>
 			<text name="landing_point">
@@ -457,9 +466,12 @@ Nur große Parzellen können in der Suche aufgeführt werden.
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="Verbannen" name="BanCheck">
-					Immer verbannt ([COUNT], max. [MAX])
+					Verbannt ([COUNT], max. [MAX])
 				</text>
-				<name_list name="BannedList" tool_tip="([LISTED] aufgeführt, [MAX] max)"/>
+				<name_list name="BannedList" tool_tip="([LISTED] aufgeführt, [MAX] max)">
+					<columns label="Name" name="name"/>
+					<columns label="Dauer" name="duration"/>
+				</name_list>
 				<button label="Hinzufügen" name="add_banned"/>
 				<button label="Entfernen" label_selected="Entfernen" name="remove_banned"/>
 			</panel>
diff --git a/indra/newview/skins/default/xui/de/floater_ban_duration.xml b/indra/newview/skins/default/xui/de/floater_ban_duration.xml
new file mode 100644
index 0000000000..19e55f5527
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_ban_duration.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="ban_duration" title="Verbannungsdauer">
+	<text name="duration_textbox">
+		Verbannungsdauer:
+	</text>
+	<radio_group name="ban_duration_radio">
+		<radio_item label="Immer" name="always_radio">
+			Immer
+		</radio_item>
+		<radio_item label="Temporär" name="temporary_radio">
+			Temporär
+		</radio_item>
+	</radio_group>
+	<text name="hours_textbox">
+		Stunden.
+	</text>
+	<button label="OK" name="ok_btn"/>
+	<button label="Abbrechen" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_gesture.xml b/indra/newview/skins/default/xui/de/floater_gesture.xml
index 7b35da8d5c..0a82535040 100644
--- a/indra/newview/skins/default/xui/de/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/de/floater_gesture.xml
@@ -21,7 +21,7 @@
 		<button name="activate_btn" tool_tip="Ausgewählte Geste aktivieren/deaktivieren"/>
 		<button name="del_btn" tool_tip="Diese Geste löschen"/>
 	</panel>
-	<button label="Bearbeiten" name="edit_btn"/>
-	<button label="Abspielen" name="play_btn"/>
+	<button label="Bearbeiten" name="edit_btn" tool_tip="Fenster zum Bearbeiten der ausgewählten Geste öffnen."/>
+	<button label="Abspielen" name="play_btn" tool_tip="Ausgewählte Geste inworld ausführen."/>
 	<button label="Stopp" name="stop_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml
index 1361366bd5..41e8dc5ef4 100644
--- a/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml
@@ -43,6 +43,7 @@
 	<check_box label="Anisotropische Filterung (langsamer, wenn aktiviert)" name="ani"/>
 	<check_box initial_value="true" label="OpenGL Vertex-Buffer-Objekte aktivieren" name="vbo" tool_tip="Wenn Sie über moderne Grafikhardware verfügen, können Sie durch Aktivieren dieser Option die Geschwindigkeit verbessern.  Bei alter Hardware sind die VBO oft schlecht implementiert, was zu Abstürzen führen kann, wenn diese Option aktiviert ist."/>
 	<check_box initial_value="true" label="Texturkomprimierung aktivieren (Neustart erforderlich)" name="texture compression" tool_tip="Komprimiert Texturen im Videospeicher, damit höher auflösende Texturen geladen werden können (leichte Beeinträchtigung der Farbqualität)."/>
+	<check_box initial_value="true" label="Unterstützung für HiDPI-Displays aktivieren (Neustart erforderlich)" name="use HiDPI" tool_tip="OpenGL für hochauflösende Darstellung aktivieren."/>
 	<text name="antialiasing label">
 		Antialiasing:
 	</text>
diff --git a/indra/newview/skins/default/xui/de/floater_preview_notecard.xml b/indra/newview/skins/default/xui/de/floater_preview_notecard.xml
index 14e666fd22..21419d8e10 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_notecard.xml
@@ -15,6 +15,7 @@
 	<text_editor name="Notecard Editor">
 		Wird geladen...
 	</text_editor>
+	<button label="Bearbeiten..." label_selected="Bearbeiten" name="Edit"/>
 	<button label="Speichern" label_selected="Speichern" name="Save"/>
 	<button label="Löschen" label_selected="Löschen" name="Delete"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_report_abuse.xml b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
index 6999679b3f..154256b53e 100644
--- a/indra/newview/skins/default/xui/de/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
@@ -77,7 +77,7 @@ Objekt:
 		<combo_box.item label="Land &gt; Unbefugte Nutzung &gt; Objekte oder Texturen" name="Land__Encroachment__Objects_textures"/>
 		<combo_box.item label="Land &gt; Unbefugte Nutzung &gt; Partikel" name="Land__Encroachment__Particles"/>
 		<combo_box.item label="Land &gt; Unbefugte Nutzung &gt; Bäume/Pflanzen" name="Land__Encroachment__Trees_plants"/>
-		<combo_box.item label="Verstoß gegen die Spielerichtlinie" name="Wagering_gambling"/>
+		<combo_box.item label="Verstoß gegen die Geschicklichkeits-Spielerichtlinie" name="Wagering_gambling"/>
 		<combo_box.item label="Sonstige" name="Other"/>
 	</combo_box>
 	<text name="abuser_name_title">
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 17ed6a5385..feb1ae23a5 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -1607,7 +1607,7 @@ Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 un
 		[AGENT] wurden zur [LIST_TYPE]-Liste von [ESTATE] hinzugefügt.
 	</notification>
 	<notification name="AgentWasRemovedFromList">
-		[AGENT] wurden von der [LIST_TYPE]-Liste von [ESTATE] entfernt.
+		[AGENT] wurde von der [LIST_TYPE]-Liste von [ESTATE] entfernt.
 	</notification>
 	<notification name="AgentsWereRemovedFromList">
 		[AGENT] wurden von der [LIST_TYPE]-Liste von [ESTATE] entfernt.
diff --git a/indra/newview/skins/default/xui/de/panel_group_general.xml b/indra/newview/skins/default/xui/de/panel_group_general.xml
index 9d4301de73..9fec5a242d 100644
--- a/indra/newview/skins/default/xui/de/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_general.xml
@@ -46,7 +46,7 @@ Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen.
 		<check_box label="Jeder kann beitreten" name="open_enrollement" tool_tip="Festlegen, ob der Gruppenbeitritt ohne Einladung zulässig ist."/>
 		<check_box label="Kosten für Beitritt" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen"/>
 		<spinner label="L$" name="spin_enrollment_fee" tool_tip="Wenn Beitrittsgebühr aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen."/>
-		<combo_box name="group_mature_check" tool_tip="Legt fest, ob Ihre Gruppeninformation moderate Inhalte enthält">
+		<combo_box name="group_mature_check" tool_tip="Inhaltseinstufungen kennzeichnen die in einer Gruppe zulässigen Inhalte und Verhaltensweisen">
 			<combo_item name="select_mature">
 				- Inhaltseinstufung auswählen -
 			</combo_item>
diff --git a/indra/newview/skins/default/xui/de/panel_region_access.xml b/indra/newview/skins/default/xui/de/panel_region_access.xml
index 4ebc4867fb..d2448bea7e 100644
--- a/indra/newview/skins/default/xui/de/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_access.xml
@@ -14,6 +14,7 @@
 		<panel label="ZULÄSSIG" name="allowed_panel">
 			<panel label="top_panel" name="allowed_search_panel">
 				<filter_editor label="Zulässige Agenten suchen" name="allowed_search_input"/>
+				<button label="Kopieren" name="copy_allowed_list_btn"/>
 			</panel>
 			<text name="allow_resident_label">
 				Immer zugelassen:
@@ -26,7 +27,8 @@
 		</panel>
 		<panel label="ZULÄSSIGE GRUPPEN" name="allowed_groups_panel">
 			<panel label="top_panel" name="allowed_group_search_panel">
-				<filter_editor label="Zulässige Gruppen Suchen" name="allowed_group_search_input"/>
+				<filter_editor label="Zulässige Gruppen suchen" name="allowed_group_search_input"/>
+				<button label="Kopieren" name="copy_allowed_group_list_btn"/>
 			</panel>
 			<text name="allow_group_label">
 				Immer zugelassene Gruppen:
@@ -40,6 +42,7 @@
 		<panel label="VERBANNT" name="banned_panel">
 			<panel label="top_panel" name="banned_search_panel">
 				<filter_editor label="Verbannte Agenten suchen" name="banned_search_input"/>
+				<button label="Kopieren" name="copy_banned_list_btn"/>
 			</panel>
 			<text name="ban_resident_label">
 				Immer verbannt:
diff --git a/indra/newview/skins/default/xui/de/panel_region_estate.xml b/indra/newview/skins/default/xui/de/panel_region_estate.xml
index b713dd58d0..f6a5ed22f9 100644
--- a/indra/newview/skins/default/xui/de/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_estate.xml
@@ -16,7 +16,7 @@
 		(unbekannt)
 	</text>
 	<radio_group name="externally_visible_radio">
-		<radio_item label="Nur Einwohner und Gruppen zulassen, die im Reiter &quot;Zugang&quot; aufgelistet sind." name="estate_restricted_access"/>
+		<radio_item label="Nur Einwohner und Gruppen zulassen, die im Reiter &quot;Zugang&quot; aufgelistet sind" name="estate_restricted_access"/>
 		<radio_item label="Alle Besucher zugelassen" name="estate_public_access"/>
 	</radio_group>
 	<check_box label="Muss 18+ sein" name="limit_age_verified" tool_tip="Nur Einwohner, die mindestens 18 Jahre alt sind, können diesen Grundbesitz betreten. Weitere Informationen finden Sie unter [SUPPORT_SITE]."/>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 6e980d1609..db51e0a6e8 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -75,6 +75,9 @@ Erweitertes Beleuchtungsmodell: [GPU_SHADERS]
 Texturspeicher: [TEXTURE_MEMORY] MB
 Erstellungszeit VFS (Cache): [VFS_TIME]
 	</string>
+	<string name="AboutOSXHiDPI">
+		HiDPI-Anzeigemodus: [HIDPI]
+	</string>
 	<string name="AboutLibs">
 		J2C-Decoderversion: [J2C_VERSION]
 Audiotreiberversion: [AUDIO_DRIVER_VERSION]
@@ -1477,6 +1480,15 @@ besuchen Sie bitte http://secondlife.com/support
 	<string name="MarketplaceURL_LearnMore">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more
 	</string>
+	<string name="InventoryPlayAnimationTooltip">
+		Fenster mit Spieloptionen öffnen.
+	</string>
+	<string name="InventoryPlayGestureTooltip">
+		Ausgewählte Geste inworld ausführen.
+	</string>
+	<string name="InventoryPlaySoundTooltip">
+		Fenster mit Spieloptionen öffnen.
+	</string>
 	<string name="InventoryOutboxNotMerchantTitle">
 		Jeder kann Artikel im Marktplatz verkaufen.
 	</string>
@@ -5398,9 +5410,6 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Destinations_Label">
 		Ziele
 	</string>
-	<string name="Command_Facebook_Label">
-		Facebook
-	</string>
 	<string name="Command_Flickr_Label">
 		Flickr
 	</string>
@@ -5494,9 +5503,6 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Destinations_Tooltip">
 		Ziele von Interesse
 	</string>
-	<string name="Command_Facebook_Tooltip">
-		Auf Facebook posten
-	</string>
 	<string name="Command_Flickr_Tooltip">
 		Auf Flickr hochladen
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index b5da302762..998d2a8863 100644
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -9,6 +9,12 @@
 	<floater.string name="maturity_icon_adult">
 		&quot;Parcel_R_Dark&quot;
 	</floater.string>
+	<floater.string name="Hours">
+		[HOURS] hrs.
+	</floater.string>
+	<floater.string name="Hour">
+		hr.
+	</floater.string>
 	<floater.string name="Minutes">
 		[MINUTES] min.
 	</floater.string>
@@ -21,6 +27,9 @@
 	<floater.string name="Remaining">
 		restantes
 	</floater.string>
+	<floater.string name="Always">
+		Siempre
+	</floater.string>
 	<tab_container name="landtab">
 		<panel label="GENERAL" name="land_general_panel">
 			<panel.string name="new users only">
@@ -318,18 +327,18 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda.
 			<text name="allow_label2">
 				Crear objetos:
 			</text>
-			<check_box label="Todos los residentes" name="edit objects check"/>
-			<check_box label="El grupo" name="edit group objects check"/>
+			<check_box label="Todos los residentes" name="edit objects check" tool_tip="Si se selecciona, los residentes pueden crear y colocar objetos en tu tierra."/>
+			<check_box label="El grupo" name="edit group objects check" tool_tip="Si se selecciona, los miembros de un grupo con parcelas pueden crear y colocar objetos en tu tierra."/>
 			<text name="allow_label3">
 				Dejar objetos:
 			</text>
-			<check_box label="Todos los residentes" name="all object entry check"/>
-			<check_box label="El grupo" name="group object entry check"/>
+			<check_box label="Todos los residentes" name="all object entry check" tool_tip="Si se selecciona, los Residentes pueden mover objetos existentes de otras parcelas a esta."/>
+			<check_box label="El grupo" name="group object entry check" tool_tip="Si se selecciona, los miembros de un grupo con parcelas pueden mover objetos existentes de otras parcelas a esta."/>
 			<text name="allow_label4">
 				Ejecutar scripts:
 			</text>
-			<check_box label="Todos los residentes" name="check other scripts"/>
-			<check_box label="El grupo" name="check group scripts"/>
+			<check_box label="Todos los residentes" name="check other scripts" tool_tip="Si se selecciona, los Residentes pueden correr scripts en tu parcela, incluidos adjuntos."/>
+			<check_box label="El grupo" name="check group scripts" tool_tip="Si se selecciona, los miembros de un grupo con parcelas pueden correr scripts en tu parcela, incluidos adjuntos."/>
 			<check_box label="Seguro (sin daño)" name="check safe" tool_tip="Si se marca, convierte el terreno en &apos;seguro&apos;, desactivando el daño en combate. Si no, se activa el daño en combate."/>
 			<check_box label="Sin &apos;empujones&apos;" name="PushRestrictCheck" tool_tip="Previene scripts que empujen. Marcando esta opción prevendrá que en su terreno haya comportamientos destructivos."/>
 			<check_box label="Mostrar el sitio en la búsqueda (30 L$/semana)" name="ShowDirectoryCheck" tool_tip="Let people see this parcel in search results"/>
@@ -353,7 +362,7 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda.
 				Foto:
 			</text>
 			<texture_picker label="" name="snapshot_ctrl" tool_tip="Pulse para elegir una imagen"/>
-			<text name="allow_label5" top="170">
+			<text name="allow_see_label">
 				Los avatares de otras parcelas pueden ver a los avatares de esta parcela y chatear con ellos
 			</text>
 			<check_box label="Ver los avatares" name="SeeAvatarsCheck" tool_tip="Permite que los avatares de otras parcelas vean a los avatares de ésta y chateen con ellos, y también que tú puedas verles y chatear con ellos." top="170"/>
@@ -459,9 +468,12 @@ los media:
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="Ban" name="BanCheck">
-					Siempre prohibido ([COUNT], max [MAX])
+					Prohibido ([COUNT], max [MAX])
 				</text>
-				<name_list name="BannedList" tool_tip="([LISTED] listados de un máx. de [MAX])"/>
+				<name_list name="BannedList" tool_tip="([LISTED] listados de un máx. de [MAX])">
+					<columns label="Nombre" name="name"/>
+					<columns label="Duración" name="duration"/>
+				</name_list>
 				<button label="Añadir" name="add_banned"/>
 				<button label="Quitar" label_selected="Quitar" name="remove_banned"/>
 			</panel>
diff --git a/indra/newview/skins/default/xui/es/floater_ban_duration.xml b/indra/newview/skins/default/xui/es/floater_ban_duration.xml
new file mode 100644
index 0000000000..02252ede20
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_ban_duration.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="ban_duration" title="Duración">
+	<text name="duration_textbox">
+		Duración:
+	</text>
+	<radio_group name="ban_duration_radio">
+		<radio_item label="Siempre" name="always_radio">
+			Siempre
+		</radio_item>
+		<radio_item label="Temporario" name="temporary_radio">
+			Temporario
+		</radio_item>
+	</radio_group>
+	<text name="hours_textbox">
+		horas
+	</text>
+	<button label="Aceptar" name="ok_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_gesture.xml b/indra/newview/skins/default/xui/es/floater_gesture.xml
index d90de8c9f4..45fb7c6773 100644
--- a/indra/newview/skins/default/xui/es/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/es/floater_gesture.xml
@@ -20,7 +20,7 @@
 		<button name="activate_btn" tool_tip="Activar/Desactivar el gesto elegido"/>
 		<button name="del_btn" tool_tip="Borrar este gesto"/>
 	</panel>
-	<button label="Editar" name="edit_btn"/>
-	<button label="Reproducir" name="play_btn"/>
+	<button label="Editar" name="edit_btn" tool_tip="Abrir la ventana para editar el gesto seleccionado."/>
+	<button label="Reproducir" name="play_btn" tool_tip="Realizar gesto seleccionado en el mundo."/>
 	<button label="Parar" name="stop_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/es/floater_preferences_graphics_advanced.xml
index a0618521ee..b8d5824fb7 100644
--- a/indra/newview/skins/default/xui/es/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/es/floater_preferences_graphics_advanced.xml
@@ -43,6 +43,7 @@
 	<check_box label="Filtrado anisotrópico (enlentece el dibujo)" name="ani"/>
 	<check_box initial_value="true" label="Habilitar objetos de búfer de vértices OpenGL" name="vbo" tool_tip="Su activación en un hardware moderno aumenta el rendimiento. No obstante, la ejecución poco eficiente de los VBO en los equipos antiguos puede hacer que se bloquee la aplicación."/>
 	<check_box initial_value="true" label="Activar la compresión de texturas (requiere reiniciar)" name="texture compression" tool_tip="Comprime las texturas en la memoria de vídeo, lo cual permite cargar texturas de una resolución más alta, pero con una cierta pérdida de calidad del color."/>
+	<check_box initial_value="true" label="Activar soporte para visores HiDPI (requiere reiniciar)" name="use HiDPI" tool_tip="Activar OpenGl para Dibujos de alta resolución."/>
 	<text name="antialiasing label">
 		Antialiasing:
 	</text>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
index d05a023279..d467aa749c 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
@@ -15,6 +15,7 @@
 	<text_editor name="Notecard Editor">
 		Cargando...
 	</text_editor>
+	<button label="Editar..." label_selected="Editar" name="Edit"/>
 	<button label="Guardar" label_selected="Guardar" name="Save"/>
 	<button label="Borrar" label_selected="Borrar" name="Delete"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index eac09b767b..0a3576b799 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -1589,7 +1589,7 @@ Se superan en [NUM_EXCESS] los [MAX_AGENTS] permitidos en [LIST_TYPE].
 		[AGENT] ya está en tu lista [LIST_TYPE].
 	</notification>
 	<notification name="AgentsAreAlreadyInList">
-		[AGENT] ya está en tu lista [LIST_TYPE].
+		[AGENT] ya están en tu lista [LIST_TYPE].
 	</notification>
 	<notification name="AgentWasAddedToList">
 		[AGENT] fue añadido a la lista [LIST_TYPE] de [ESTATE].
diff --git a/indra/newview/skins/default/xui/es/panel_group_general.xml b/indra/newview/skins/default/xui/es/panel_group_general.xml
index b00c300c85..a17814d15d 100644
--- a/indra/newview/skins/default/xui/es/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_general.xml
@@ -46,7 +46,7 @@ Deja el cursor sobre las opciones para ver más ayuda.
 		<check_box label="Cualquiera puede entrar" name="open_enrollement" tool_tip="Configura si se permite la entrada de nuevos miembros sin ser invitados."/>
 		<check_box label="Cuota de entrada" name="check_enrollment_fee" tool_tip="Configura si hay que pagar una cuota para entrar al grupo"/>
 		<spinner label="L$" left_delta="130" name="spin_enrollment_fee" tool_tip="Si la opción Cuota de entrada está marcada, los nuevos miembros han de pagar esta cuota para entrar al grupo." width="60"/>
-		<combo_box bottom_delta="-38" name="group_mature_check" tool_tip="Establece si la información de su grupo es moderado." width="150">
+		<combo_box bottom_delta="-38" name="group_mature_check" tool_tip="La calificación de contenido designa el tipo de contenido y conducta que se permiten en un grupo" width="150">
 			<combo_item name="select_mature">
 				- Selecciona el nivel de calificación -
 			</combo_item>
diff --git a/indra/newview/skins/default/xui/es/panel_region_access.xml b/indra/newview/skins/default/xui/es/panel_region_access.xml
index 3177aa2ab2..a6b0ee6867 100644
--- a/indra/newview/skins/default/xui/es/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_access.xml
@@ -14,6 +14,7 @@
 		<panel label="PERMITIDO" name="allowed_panel">
 			<panel label="top_panel" name="allowed_search_panel">
 				<filter_editor label="Buscar agentes autorizados" name="allowed_search_input"/>
+				<button label="Copiar" name="copy_allowed_list_btn"/>
 			</panel>
 			<text name="allow_resident_label">
 				Siempre autorizado:
@@ -27,6 +28,7 @@
 		<panel label="GRUPOS AUTORIZADOS:" name="allowed_groups_panel">
 			<panel label="top_panel" name="allowed_group_search_panel">
 				<filter_editor label="Buscar grupos autorizados" name="allowed_group_search_input"/>
+				<button label="Copiar" name="copy_allowed_group_list_btn"/>
 			</panel>
 			<text name="allow_group_label">
 				Grupos siempre autorizados:
@@ -40,6 +42,7 @@
 		<panel label="PROHIBIDO" name="banned_panel">
 			<panel label="top_panel" name="banned_search_panel">
 				<filter_editor label="Buscar agentes prohibidos" name="banned_search_input"/>
+				<button label="Copiar" name="copy_banned_list_btn"/>
 			</panel>
 			<text name="ban_resident_label">
 				Siempre prohibido:
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 68cd72802d..2b8d34859a 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -67,6 +67,9 @@ Modelo de iluminación avanzado: [GPU_SHADERS]
 Memoria de textura: [TEXTURE_MEMORY]MB
 VFS (cache) hora de creación: [VFS_TIME]
 	</string>
+	<string name="AboutOSXHiDPI">
+		Modo de visualización HiDPi: [HIDPI]
+	</string>
 	<string name="AboutLibs">
 		Versión de descodificador J2C: [J2C_VERSION] 
 Versión del controlador audio: [AUDIO_DRIVER_VERSION] 
@@ -1460,6 +1463,15 @@ http://secondlife.com/support para obtener ayuda sobre cómo solucionar este pro
 	<string name="MarketplaceURL_LearnMore">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more
 	</string>
+	<string name="InventoryPlayAnimationTooltip">
+		Abrir la ventana con las opciones del Juego
+	</string>
+	<string name="InventoryPlayGestureTooltip">
+		Realizar gesto seleccionado en el mundo.
+	</string>
+	<string name="InventoryPlaySoundTooltip">
+		Abrir la ventana con las opciones del Juego
+	</string>
 	<string name="InventoryOutboxNotMerchantTitle">
 		Cualquier usuario puede vender objetos en el mercado.
 	</string>
@@ -5309,9 +5321,6 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="Command_Destinations_Label">
 		Destinos
 	</string>
-	<string name="Command_Facebook_Label">
-		Facebook
-	</string>
 	<string name="Command_Flickr_Label">
 		Flickr
 	</string>
@@ -5405,9 +5414,6 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="Command_Destinations_Tooltip">
 		Destinos de interés
 	</string>
-	<string name="Command_Facebook_Tooltip">
-		Publicar en Facebook
-	</string>
 	<string name="Command_Flickr_Tooltip">
 		Subir a Flickr
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml
index 42d7709c99..219857eb99 100644
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -9,6 +9,12 @@
 	<floater.string name="maturity_icon_adult">
 		&quot;Parcel_R_Dark&quot;
 	</floater.string>
+	<floater.string name="Hours">
+		[HEURES] hrs.
+	</floater.string>
+	<floater.string name="Hour">
+		hr.
+	</floater.string>
 	<floater.string name="Minutes">
 		[MINUTES] min
 	</floater.string>
@@ -21,6 +27,9 @@
 	<floater.string name="Remaining">
 		restantes
 	</floater.string>
+	<floater.string name="Always">
+		Toujours
+	</floater.string>
 	<tab_container name="landtab" tab_min_width="60">
 		<panel label="GÉNÉRAL" name="land_general_panel">
 			<panel.string name="new users only">
@@ -322,18 +331,18 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 			<text name="allow_label2">
 				Construire :
 			</text>
-			<check_box label="Tous" name="edit objects check"/>
-			<check_box label="Groupe" name="edit group objects check"/>
+			<check_box label="Tous" name="edit objects check" tool_tip="Si la case est cochée, les résidents peuvent créer et rezzer des objets sur votre terrain."/>
+			<check_box label="Groupe" name="edit group objects check" tool_tip="Si la case est cochée, les membres du groupe de la parcelle peuvent créer et rezzer des objets sur votre terrain."/>
 			<text name="allow_label3">
 				Laisser entrer des objets :
 			</text>
-			<check_box label="Tous" name="all object entry check"/>
-			<check_box label="Groupe" name="group object entry check"/>
+			<check_box label="Tous" name="all object entry check" tool_tip="Si la case est cochée, les résidents peuvent déplacer les objets des autres parcelles pour les amener sur cette parcelle."/>
+			<check_box label="Groupe" name="group object entry check" tool_tip="Si la case est cochée, les membres du groupe de la parcelle peuvent déplacer les objets des autres parcelles pour les amener sur cette parcelle."/>
 			<text name="allow_label4">
 				Exécuter des scripts :
 			</text>
-			<check_box label="Tous" name="check other scripts"/>
-			<check_box label="Groupe" name="check group scripts"/>
+			<check_box label="Tous" name="check other scripts" tool_tip="Si la case est cochée, les membres du groupe de la parcelle peuvent exécuter des scripts sur votre parcelle, y compris des pièces jointes."/>
+			<check_box label="Groupe" name="check group scripts" tool_tip="Si la case est cochée, les membres du groupe de la parcelle peuvent exécuter des scripts sur votre parcelle, y compris des pièces jointes."/>
 			<check_box label="Sécurisé (pas de dégâts)" name="check safe" tool_tip="Si cette option est cochée, le terrain est sécurisé et il n&apos;y pas de risques de dommages causés par des combats. Si elle est décochée, des dommages causés par les combats peuvent avoir lieu."/>
 			<check_box label="Pas de bousculades" name="PushRestrictCheck" tool_tip="Empêche l&apos;utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain."/>
 			<check_box label="Voir le lieu dans la recherche (30 L$/sem.)" name="ShowDirectoryCheck" tool_tip="Afficher la parcelle dans les résultats de recherche"/>
@@ -357,7 +366,7 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 				Photo :
 			</text>
 			<texture_picker label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image"/>
-			<text name="allow_label5">
+			<text name="allow_see_label">
 				Les avatars sur d&apos;autres parcelles peuvent voir et chatter avec les avatars sur cette parcelle.
 			</text>
 			<check_box label="Voir les avatars" name="SeeAvatarsCheck" tool_tip="Permettre aux avatars présents sur d&apos;autres parcelles de voir et chatter avec les avatars présents sur cette parcelle et à vous de les voir et de chatter avec eux."/>
@@ -464,9 +473,12 @@ musique :
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="Bannir" name="BanCheck">
-					Toujours interdit ([COUNT], max. [MAX])
+					Interdit interdit ([COUNT], max. [MAX])
 				</text>
-				<name_list name="BannedList" tool_tip="([LISTED] dans la liste, [MAX] max.)"/>
+				<name_list name="BannedList" tool_tip="([LISTED] dans la liste, [MAX] max.)">
+					<columns label="Nom" name="name"/>
+					<columns label="Durée" name="duration"/>
+				</name_list>
 				<button label="Ajouter" name="add_banned"/>
 				<button label="Supprimer" label_selected="Supprimer" name="remove_banned"/>
 			</panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_ban_duration.xml b/indra/newview/skins/default/xui/fr/floater_ban_duration.xml
new file mode 100644
index 0000000000..2c877b81fa
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_ban_duration.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="ban_duration" title="Durée de l&apos;interdiction">
+	<text name="duration_textbox">
+		Durée de l&apos;interdiction :
+	</text>
+	<radio_group name="ban_duration_radio">
+		<radio_item label="Toujours" name="always_radio">
+			Toujours
+		</radio_item>
+		<radio_item label="Temporaire" name="temporary_radio">
+			Temporaire
+		</radio_item>
+	</radio_group>
+	<text name="hours_textbox">
+		heures
+	</text>
+	<button label="OK" name="ok_btn"/>
+	<button label="Annuler" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_gesture.xml b/indra/newview/skins/default/xui/fr/floater_gesture.xml
index 5ead1cae3a..9f4822e626 100644
--- a/indra/newview/skins/default/xui/fr/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_gesture.xml
@@ -21,7 +21,7 @@
 		<button name="activate_btn" tool_tip="Activer/désactiver le geste sélectionné"/>
 		<button name="del_btn" tool_tip="Supprimer ce geste"/>
 	</panel>
-	<button label="Modifier" name="edit_btn"/>
-	<button label="Lire" name="play_btn"/>
+	<button label="Modifier" name="edit_btn" tool_tip="Ouvrir la fenêtre pour modifier le geste sélectionné"/>
+	<button label="Lire" name="play_btn" tool_tip="Exécuter le geste sélectionné dans le monde virtuel."/>
 	<button label="Stop" name="stop_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml
index 23fff3b770..fd47254934 100644
--- a/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml
@@ -43,6 +43,7 @@
 	<check_box label="Filtre anisotrope (plus lent quand activé)" name="ani"/>
 	<check_box initial_value="true" label="Activer OpenGL Vertex Buffer Objects" name="vbo" tool_tip="L’activation de cette option sur le matériel récent permet un gain de performance.  Cependant, les implémentations VBO pour le matériel plus ancien sont souvent médiocres et votre système risque de se planter quand cette option est activée."/>
 	<check_box initial_value="true" label="Activer la compression des textures (redémarrage requis)" name="texture compression" tool_tip="Comprime les textures en mémoire vidéo afin de permettre de charger des textures de résolution plus élevée au prix d’une certaine qualité de couleur."/>
+	<check_box initial_value="true" label="Activer le support pour l&apos;affichage en HiDPI (redémarrage requis)" name="use HiDPI" tool_tip="Activer OpenFL pour les dessins en haute résolution"/>
 	<text name="antialiasing label">
 		Anti-aliasing :
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
index 5646ad45eb..1fc065e6c5 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
@@ -15,6 +15,7 @@
 	<text_editor name="Notecard Editor">
 		Chargement...
 	</text_editor>
+	<button label="Modifier..." label_selected="Modifier" name="Edit"/>
 	<button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
 	<button label="Supprimer" label_selected="Supprimer" name="Delete"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 4239c949fd..54f132f684 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -1572,10 +1572,10 @@ Dépasse la limite fixée à [MAX_AGENTS] [LIST_TYPE] de [NUM_EXCESS].
 		Impossible d’ajouter un résident banni à la liste des gérants de domaine.
 	</notification>
 	<notification name="ProblemBanningEstateManager">
-		Impossible d&apos;ajouter le gérant de domaine à la liste interdite.
+		Impossible d&apos;ajouter le gérant de domaine [AGENT] à la liste interdite.
 	</notification>
 	<notification name="GroupIsAlreadyInList">
-		&lt;nolink&gt;[GROUP]&lt;/nolink&gt; est déjà dans la liste des groupes autorisés.
+		&lt;nolink&gt;[GROUP]&lt;/nolink&gt; est déjà dans la liste des Groupes autorisés.
 	</notification>
 	<notification name="AgentIsAlreadyInList">
 		[AGENT] est déjà dans votre liste [LIST_TYPE].
@@ -1587,7 +1587,7 @@ Dépasse la limite fixée à [MAX_AGENTS] [LIST_TYPE] de [NUM_EXCESS].
 		[AGENT] a été ajouté à la liste [LIST_TYPE] de [ESTATE].
 	</notification>
 	<notification name="AgentsWereAddedToList">
-		[AGENT] ont été ajoutéq à la liste [LIST_TYPE] de [ESTATE].
+		[AGENT] ont été ajouté à la liste [LIST_TYPE] de [ESTATE].
 	</notification>
 	<notification name="AgentWasRemovedFromList">
 		[AGENT] a été supprimé de la liste [LIST_TYPE] de [ESTATE].
@@ -2987,7 +2987,7 @@ Si vous restez dans cette région, vous serez déconnecté(e).
 Si vous restez dans cette région, vous serez déconnecté(e).
 	</notification>
 	<notification name="LoadWebPage">
-Charger la page Web [URL] ?
+		Charger la page Web [URL] ?
 
 [MESSAGE]
 
diff --git a/indra/newview/skins/default/xui/fr/panel_group_general.xml b/indra/newview/skins/default/xui/fr/panel_group_general.xml
index a2655dcd45..5953e210e5 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_general.xml
@@ -46,7 +46,7 @@ Faites glisser le pointeur de la souris sur les options pour en savoir plus.
 		<check_box label="Inscription ouverte à tous" name="open_enrollement" tool_tip="Indique si ce groupe autorise les nouveaux membres à le rejoindre sans y être invités."/>
 		<check_box label="Inscription payante" name="check_enrollment_fee" tool_tip="Indique s&apos;il faut payer des frais d&apos;inscription pour rejoindre ce groupe"/>
 		<spinner label="L$" name="spin_enrollment_fee" tool_tip="Les nouveaux membres doivent payer ces frais pour rejoindre le groupe quand l&apos;option Frais d&apos;inscription est cochée."/>
-		<combo_box name="group_mature_check" tool_tip="Définit si votre groupe contient des informations de type Modéré" width="195">
+		<combo_box name="group_mature_check" tool_tip="Il s&apos;agit du type de contenu et de comportement autorisé au sein d&apos;un groupe." width="195">
 			<combo_item name="select_mature">
 				- Catégorie de contenu -
 			</combo_item>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_access.xml b/indra/newview/skins/default/xui/fr/panel_region_access.xml
index db77f3b8f1..ab62d3247f 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_access.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="ACCÈS" name="Access">
+<panel label="Accès" name="Access">
 	<tab_container name="tabs">
 		<panel label="GÉRANTS DU DOMAINE" name="estate_managers_panel">
 			<text name="estate_manager_label">
@@ -14,6 +14,7 @@
 		<panel label="AUTORISÉ" name="allowed_panel">
 			<panel label="top_panel" name="allowed_search_panel">
 				<filter_editor label="Rechercher des agents autorisés" name="allowed_search_input"/>
+				<button label="Copier" name="copy_allowed_list_btn"/>
 			</panel>
 			<text name="allow_resident_label">
 				Toujours autorisé :
@@ -27,6 +28,7 @@
 		<panel label="GROUPES AUTORISÉS" name="allowed_groups_panel">
 			<panel label="top_panel" name="allowed_group_search_panel">
 				<filter_editor label="Rechercher des groupes autorisés" name="allowed_group_search_input"/>
+				<button label="Copier" name="copy_allowed_group_list_btn"/>
 			</panel>
 			<text name="allow_group_label">
 				Groupes toujours autorisés :
@@ -40,6 +42,7 @@
 		<panel label="INTERDIT" name="banned_panel">
 			<panel label="top_panel" name="banned_search_panel">
 				<filter_editor label="Rechercher des agents interdits" name="banned_search_input"/>
+				<button label="Copier" name="copy_banned_list_btn"/>
 			</panel>
 			<text name="ban_resident_label">
 				Toujours interdit :
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 9cd5770108..ab106a9ba8 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -76,6 +76,9 @@ Modèle d’éclairage avancé : [GPU_SHADERS]
 Mémoire textures : [TEXTURE_MEMORY] Mo
 Heure de création VFS (cache) : [VFS_TIME]
 	</string>
+	<string name="AboutOSXHiDPI">
+		Mode d&apos;affichage HiDPI : [HIDPI]
+	</string>
 	<string name="AboutLibs">
 		J2C Decoder Version: [J2C_VERSION] 
 Audio Driver Version: [AUDIO_DRIVER_VERSION] 
@@ -1478,6 +1481,15 @@ http://secondlife.com/support pour vous aider à résoudre ce problème.
 	<string name="MarketplaceURL_LearnMore">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more
 	</string>
+	<string name="InventoryPlayAnimationTooltip">
+		Ouvrir la fenêtre avec les options Jeu
+	</string>
+	<string name="InventoryPlayGestureTooltip">
+		Exécuter le geste sélectionné dans le monde virtuel.
+	</string>
+	<string name="InventoryPlaySoundTooltip">
+		Ouvrir la fenêtre avec les options Jeu
+	</string>
 	<string name="InventoryOutboxNotMerchantTitle">
 		Tout le monde peut vendre des articles sur la Place du marché.
 	</string>
@@ -5399,9 +5411,6 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="Command_Destinations_Label">
 		Destinations
 	</string>
-	<string name="Command_Facebook_Label">
-		Facebook
-	</string>
 	<string name="Command_Flickr_Label">
 		Flickr
 	</string>
@@ -5495,9 +5504,6 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="Command_Destinations_Tooltip">
 		Destinations intéressantes
 	</string>
-	<string name="Command_Facebook_Tooltip">
-		Publier sur Facebook
-	</string>
 	<string name="Command_Flickr_Tooltip">
 		Charger sur Flickr
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml
index 67c46b6b62..0a7837e122 100644
--- a/indra/newview/skins/default/xui/it/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_about_land.xml
@@ -9,6 +9,12 @@
 	<floater.string name="maturity_icon_adult">
 		&quot;Parcel_R_Dark&quot;
 	</floater.string>
+	<floater.string name="Hours">
+		[HOURS] ore.
+	</floater.string>
+	<floater.string name="Hour">
+		ora.
+	</floater.string>
 	<floater.string name="Minutes">
 		[MINUTES] min
 	</floater.string>
@@ -21,6 +27,9 @@
 	<floater.string name="Remaining">
 		rimanenti
 	</floater.string>
+	<floater.string name="Always">
+		Sempre
+	</floater.string>
 	<tab_container name="landtab">
 		<panel label="GENERALE" name="land_general_panel">
 			<panel.string name="new users only">
@@ -323,18 +332,18 @@ Solamente terreni più grandi possono essere abilitati nella ricerca.
 			<text name="allow_label2">
 				Creare oggetti:
 			</text>
-			<check_box label="Tutti i residenti" name="edit objects check"/>
-			<check_box label="Gruppo" name="edit group objects check"/>
+			<check_box label="Tutti i residenti" name="edit objects check" tool_tip="Se la casella è spuntata, i Residenti possono creare e rezzare oggetti sul tuo terreno."/>
+			<check_box label="Gruppo" name="edit group objects check" tool_tip="Se la casella è spuntata, i Residenti possono creare e rezzare oggetti sul tuo terreno."/>
 			<text name="allow_label3">
 				Immissione oggetti:
 			</text>
-			<check_box label="Tutti i residenti" name="all object entry check"/>
-			<check_box label="Gruppo" name="group object entry check"/>
+			<check_box label="Tutti i residenti" name="all object entry check" tool_tip="Se la casella è spuntata, i membri del lotto di gruppo possono muovere gli oggetti esistenti da altri lotti a questo."/>
+			<check_box label="Gruppo" name="group object entry check" tool_tip="Se la casella è spuntata, i membri del lotto di gruppo possono muovere gli oggetti esistenti da altri lotti a questo."/>
 			<text name="allow_label4">
 				Avere script attivi:
 			</text>
-			<check_box label="Tutti i residenti" name="check other scripts"/>
-			<check_box label="Gruppo" name="check group scripts"/>
+			<check_box label="Tutti i residenti" name="check other scripts" tool_tip="Se la casella è spuntata, i Residenti possono eseguire script sul tuo lotto, compresi gli allegati."/>
+			<check_box label="Gruppo" name="check group scripts" tool_tip="Se la casella è spuntata, i Residenti possono eseguire script sul tuo lotto, compresi gli allegati."/>
 			<check_box label="Sicuro (senza danno)" name="check safe" tool_tip="Se spuntato, imposta il terreno su &apos;sicuro&apos;, disabilitando i danni da combattimento. Se non spuntato, viene abilitato il combattimento con danni."/>
 			<check_box label="Nessuna spinta" name="PushRestrictCheck" tool_tip="Previeni i colpi. Selezionare questa opzione può essere utile per prevenire comportamenti dannosi sul tuo terreno."/>
 			<check_box label="Mostra luogo nella ricerca (30 L$/settimana)" name="ShowDirectoryCheck" tool_tip="Consenti che il lotto sia visto nei risultati di ricerca"/>
@@ -358,8 +367,8 @@ Solamente terreni più grandi possono essere abilitati nella ricerca.
 				Fotografia:
 			</text>
 			<texture_picker label="" name="snapshot_ctrl" tool_tip="Clicca per scegliere una immagine"/>
-			<text name="allow_label5">
-				Gli avatar su altri lotti possono vedere gli avatar su questo lotto e chattare con loro
+			<text name="allow_see_label">
+				Gli avatar di altri lotti possono vedere gli avatar che si trovano in questo lotto e chattare con loro
 			</text>
 			<check_box label="Vedi avatar" name="SeeAvatarsCheck" tool_tip="Consente ad avatar in altri lotti di vedere e chattare con avatar in questo lotto e viceversa."/>
 			<text name="landing_point">
@@ -464,9 +473,12 @@ Media:
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="Espelli" name="BanCheck">
-					Sempre esclusi ([COUNT], max [MAX])
+					Espulsi ([COUNT], max [MAX])
 				</text>
-				<name_list name="BannedList" tool_tip="([LISTED] in lista, [MAX] max)"/>
+				<name_list name="BannedList" tool_tip="([LISTED] in lista, [MAX] max)">
+					<columns label="Nome" name="name"/>
+					<columns label="Durata" name="duration"/>
+				</name_list>
 				<button label="Aggiungi" name="add_banned"/>
 				<button label="Rimuovi" label_selected="Rimuovi" name="remove_banned"/>
 			</panel>
diff --git a/indra/newview/skins/default/xui/it/floater_ban_duration.xml b/indra/newview/skins/default/xui/it/floater_ban_duration.xml
new file mode 100644
index 0000000000..996cb82cd7
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_ban_duration.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="ban_duration" title="Durata espulsione">
+	<text name="duration_textbox">
+		Durata espulsione:
+	</text>
+	<radio_group name="ban_duration_radio">
+		<radio_item label="Sempre" name="always_radio">
+			Sempre
+		</radio_item>
+		<radio_item label="Temporanea" name="temporary_radio">
+			Temporanea
+		</radio_item>
+	</radio_group>
+	<text name="hours_textbox">
+		ore.
+	</text>
+	<button label="Ok" name="ok_btn"/>
+	<button label="Annulla" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_gesture.xml b/indra/newview/skins/default/xui/it/floater_gesture.xml
index b9419ebc22..0382cf9a90 100644
--- a/indra/newview/skins/default/xui/it/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/it/floater_gesture.xml
@@ -20,7 +20,7 @@
 		<button name="activate_btn" tool_tip="Attiva/Disattiva gesture selezionata"/>
 		<button name="del_btn" tool_tip="Elimina questa gesture"/>
 	</panel>
-	<button label="Modifica" name="edit_btn"/>
-	<button label="Play" name="play_btn"/>
+	<button label="Modifica" name="edit_btn" tool_tip="Apri la finestra per modificare il movimento selezionato."/>
+	<button label="Play" name="play_btn" tool_tip="Esegui il movimento selezionato nel mondo virtuale."/>
 	<button label="Stop" name="stop_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml
index b9fe6d76e7..3773ef3711 100644
--- a/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml
@@ -43,6 +43,7 @@
 	<check_box label="Filtro anisotropico (rallenta quando è attivato)" name="ani"/>
 	<check_box initial_value="true" label="Attiva oggetti buffer vertici OpenGL" name="vbo" tool_tip="Se si attiva questa impostazione su hardware più recente si migliorano le prestazioni. Con la funzione attiva, l&apos;hardware meno recente potrebbe implementare VBO in maniera errata, causando interruzioni."/>
 	<check_box initial_value="true" label="Attiva compressione texture (richiede riavvio)" name="texture compression" tool_tip="Comprime le texture nella memoria video, consentendo il caricamento di texture a risoluzione maggiore al prezzo di una perdita di qualità del colore."/>
+	<check_box initial_value="true" label="Abilita assistenza per display HiDPI (riavvio necessario)" name="use HiDPI" tool_tip="Abilita OpenGL per disegni ad alta risoluzione."/>
 	<text name="antialiasing label">
 		Antialiasing:
 	</text>
diff --git a/indra/newview/skins/default/xui/it/floater_preview_notecard.xml b/indra/newview/skins/default/xui/it/floater_preview_notecard.xml
index 7ec229f9d3..d08bcb217b 100644
--- a/indra/newview/skins/default/xui/it/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/it/floater_preview_notecard.xml
@@ -15,6 +15,7 @@
 	<text_editor name="Notecard Editor">
 		In caricamento...
 	</text_editor>
+	<button label="Modifica..." label_selected="Modifica" name="Edit"/>
 	<button label="Salva" label_selected="Salva" name="Save"/>
 	<button label="Elimina" label_selected="Elimina" name="Delete"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_report_abuse.xml b/indra/newview/skins/default/xui/it/floater_report_abuse.xml
index f74d84fb8f..2fad438a4e 100644
--- a/indra/newview/skins/default/xui/it/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/it/floater_report_abuse.xml
@@ -76,7 +76,7 @@
 		<combo_box.item label="Terreno &gt; Invasione &gt; Oggetti o texture" name="Land__Encroachment__Objects_textures"/>
 		<combo_box.item label="Terreno &gt; Invasione &gt; Particelle" name="Land__Encroachment__Particles"/>
 		<combo_box.item label="Terreno &gt; Invasione &gt; Alberi/piante" name="Land__Encroachment__Trees_plants"/>
-		<combo_box.item label="Violazione regole del gioco" name="Wagering_gambling"/>
+		<combo_box.item label="Skill Violazione regole del gioco" name="Wagering_gambling"/>
 		<combo_box.item label="Altro" name="Other"/>
 	</combo_box>
 	<text name="abuser_name_title">
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 07a3eb5095..d7be208c51 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -1574,7 +1574,7 @@ Eccede il [MAX_AGENTS] [LIST_TYPE] limite di [NUM_EXCESS].
 		Impossibile aggiungere il residente espulso alla lista dei gestori delle proprietà.
 	</notification>
 	<notification name="ProblemBanningEstateManager">
-		Impossibile aggiunere il gestore della proprietà immobiliare [AGENT] all’elenco degli espulsi.
+		Impossibile aggiungere il gestore della proprietà immobiliare [AGENT] all’elenco degli espulsi.
 	</notification>
 	<notification name="GroupIsAlreadyInList">
 		&lt;nolink&gt;[GROUP]&lt;/nolink&gt; si trova già nell’elenco dei Gruppi ammessi.
@@ -1916,7 +1916,7 @@ Cambierà migliaia di regioni e produrrà seri problemi ai vari server.
 		<usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Tutte le proprietà" yestext="Questa proprietà"/>
 	</notification>
 	<notification label="Seleziona la proprietà" name="EstateBannedAgentRemove">
-		Rimuovi questo Residente dall’elenco degli espulsi solo per questa proprietà immobiliare oppure per [ALL_ESTATES]?
+		Vuoi rimuovere questo Residente dall’elenco degli espulsi solo per questa proprietà immobiliare oppure per [ALL_ESTATES]?
 		<usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Tutte le proprietà" yestext="Questa proprietà"/>
 	</notification>
 	<notification label="Seleziona la proprietà" name="EstateManagerAdd">
diff --git a/indra/newview/skins/default/xui/it/panel_group_general.xml b/indra/newview/skins/default/xui/it/panel_group_general.xml
index 49baa73811..60028e6098 100644
--- a/indra/newview/skins/default/xui/it/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_general.xml
@@ -46,7 +46,7 @@ Muovi il tuo mouse sopra le opzioni per maggiore aiuto.
 		<check_box label="Chiunque può aderire" name="open_enrollement" tool_tip="Imposta se questo gruppo permette ai nuovi membri di aderire senza essere invitati."/>
 		<check_box label="Quota di adesione" name="check_enrollment_fee" tool_tip="Imposta se richiedere una tassa d&apos;iscrizione per aderire al gruppo"/>
 		<spinner label="L$" left_delta="136" name="spin_enrollment_fee" tool_tip="I nuovi soci devono pagare questa tassa d&apos;iscrizione quando è selezionata." width="60"/>
-		<combo_box name="group_mature_check" tool_tip="Imposta se le informazioni sul tuo gruppo sono da considerarsi di tipo Moderato.">
+		<combo_box name="group_mature_check" tool_tip="Le categorie di accesso definiscono il tipo di contenuti e di comportamenti ammessi in un gruppo">
 			<combo_item name="select_mature">
 				- Seleziona categoria di accesso -
 			</combo_item>
diff --git a/indra/newview/skins/default/xui/it/panel_region_access.xml b/indra/newview/skins/default/xui/it/panel_region_access.xml
index 06ab2b40e7..7547dbe76f 100644
--- a/indra/newview/skins/default/xui/it/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_access.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="ACCESSO" name="Access">
+<panel label="Accesso" name="Access">
 	<tab_container name="tabs">
 		<panel label="GESTORI DELLE PROPRIETÀ IMMOBILIARI" name="estate_managers_panel">
 			<text name="estate_manager_label">
-				Gestori delle proprietà immobiliari
+				Gestori delle proprietà immobiliari:
 			</text>
 			<name_list name="estate_manager_name_list">
 				<columns label="Nome" name="name"/>
@@ -14,9 +14,10 @@
 		<panel label="AMMESSO" name="allowed_panel">
 			<panel label="top_panel" name="allowed_search_panel">
 				<filter_editor label="Cerca agenti ammessi" name="allowed_search_input"/>
+				<button label="Copia" name="copy_allowed_list_btn"/>
 			</panel>
 			<text name="allow_resident_label">
-				Sempre ammesso:
+				Sempre ammessi:
 			</text>
 			<name_list name="allowed_avatar_name_list">
 				<columns label="Nome" name="name"/>
@@ -26,10 +27,11 @@
 		</panel>
 		<panel label="GRUPPI AMMESSI" name="allowed_groups_panel">
 			<panel label="top_panel" name="allowed_group_search_panel">
-				<filter_editor label="Cerca gruppi consentiti" name="allowed_group_search_input"/>
+				<filter_editor label="Cerca gruppi ammessi" name="allowed_group_search_input"/>
+				<button label="Copia" name="copy_allowed_group_list_btn"/>
 			</panel>
 			<text name="allow_group_label">
-				Gruppi sempre consentiti:
+				Gruppi sempre ammessi:
 			</text>
 			<name_list name="allowed_group_name_list">
 				<columns label="Nome" name="name"/>
@@ -40,6 +42,7 @@
 		<panel label="ESPULSI" name="banned_panel">
 			<panel label="top_panel" name="banned_search_panel">
 				<filter_editor label="Cerca agenti espulsi" name="banned_search_input"/>
+				<button label="Copia" name="copy_banned_list_btn"/>
 			</panel>
 			<text name="ban_resident_label">
 				Sempre espulsi:
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 0ea6bd5d22..948f5984df 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -73,6 +73,9 @@ Modello illuminazione avanzato: [GPU_SHADERS]
 Memoria texture: [TEXTURE_MEMORY]MB
 Data/ora creazione VFS (cache): [VFS_TIME]
 	</string>
+	<string name="AboutOSXHiDPI">
+		Modalità display HiDPI: [HIDPI]
+	</string>
 	<string name="AboutLibs">
 		J2C Versione decoder: [J2C_VERSION] 
 Versione del driver audio: [AUDIO_DRIVER_VERSION][LIBCEF_VERSION]
@@ -1468,6 +1471,15 @@ http://secondlife.com/support per risolvere il problema.
 	<string name="MarketplaceURL_LearnMore">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more
 	</string>
+	<string name="InventoryPlayAnimationTooltip">
+		Apri finestra con opzioni di Gioco.
+	</string>
+	<string name="InventoryPlayGestureTooltip">
+		Esegui il movimento selezionato nel mondo virtuale.
+	</string>
+	<string name="InventoryPlaySoundTooltip">
+		Apri finestra con opzioni di Gioco.
+	</string>
 	<string name="InventoryOutboxNotMerchantTitle">
 		Chiunque può vendere oggetti nel Marketplace.
 	</string>
@@ -5314,9 +5326,6 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="Command_Destinations_Label">
 		Destinazioni
 	</string>
-	<string name="Command_Facebook_Label">
-		Facebook
-	</string>
 	<string name="Command_Flickr_Label">
 		Flickr
 	</string>
@@ -5410,9 +5419,6 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="Command_Destinations_Tooltip">
 		Destinazioni interessanti
 	</string>
-	<string name="Command_Facebook_Tooltip">
-		Pubblica su Facebook
-	</string>
 	<string name="Command_Flickr_Tooltip">
 		Carica su Flickr
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index df94daad8e..d26a1b34d5 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -9,6 +9,12 @@
 	<floater.string name="maturity_icon_adult">
 		&quot;Parcel_R_Dark&quot;
 	</floater.string>
+	<floater.string name="Hours">
+		[HOURS] 時間
+	</floater.string>
+	<floater.string name="Hour">
+		時間
+	</floater.string>
 	<floater.string name="Minutes">
 		[MINUTES] 分
 	</floater.string>
@@ -21,6 +27,9 @@
 	<floater.string name="Remaining">
 		残り
 	</floater.string>
+	<floater.string name="Always">
+		常時
+	</floater.string>
 	<tab_container name="landtab">
 		<panel label="一般" name="land_general_panel">
 			<panel.string name="new users only">
@@ -320,18 +329,18 @@
 			<text name="allow_label2">
 				制作：
 			</text>
-			<check_box label="全員" name="edit objects check"/>
-			<check_box label="グループ" name="edit group objects check"/>
+			<check_box label="全員" name="edit objects check" tool_tip="このオプションを選択すると、住人はあなたの土地でオブジェクトの制作や rez ができます。"/>
+			<check_box label="グループ" name="edit group objects check" tool_tip="このオプションを選択すると、区画のグループメンバーは、あなたの土地でオブジェクトの制作や rez ができます。"/>
 			<text name="allow_label3">
 				オブジェクトの進入：
 			</text>
-			<check_box label="全員" name="all object entry check"/>
-			<check_box label="グループ" name="group object entry check"/>
+			<check_box label="全員" name="all object entry check" tool_tip="このオプションを選択すると、住人は他の区画にあるオブジェクトをこの区画に移動することが可能です。"/>
+			<check_box label="グループ" name="group object entry check" tool_tip="このオプションを選択すると、区画のグループメンバーは他の区画にあるオブジェクトをこの区画に移動することが可能です。"/>
 			<text name="allow_label4">
 				スクリプトの実行：
 			</text>
-			<check_box label="全員" name="check other scripts"/>
-			<check_box label="グループ" name="check group scripts"/>
+			<check_box label="全員" name="check other scripts" tool_tip="このオプションを選択すると、住人はアタッチメントなどのスクリプトをあなたの区画で実行できます。"/>
+			<check_box label="グループ" name="check group scripts" tool_tip="このオプションを選択すると、区画のグループメンバーは、アタッチメントなどのスクリプトをあなたの区画で実行できます。"/>
 			<check_box label="安全（ダメージなし）" name="check safe" tool_tip="チェックを入れるとこの土地でのダメージコンバットが無効になり、「安全」に設定されます。 チェックを外すとダメージコンバットが有効になります。"/>
 			<check_box label="プッシュ禁止" name="PushRestrictCheck" tool_tip="スクリプトによるプッシュを禁止します。 このオプションを選択することにより、あなたの土地での破壊的行動を防ぐことができます。"/>
 			<check_box label="検索に区画を表示（週 L$ 30）" name="ShowDirectoryCheck" tool_tip="この区画を検索結果に表示します"/>
@@ -355,8 +364,8 @@
 				スナップショット：
 			</text>
 			<texture_picker label="" name="snapshot_ctrl" tool_tip="写真をクリックして選択"/>
-			<text name="allow_label5">
-				他の区画にいるアバターがこの区画にいるアバターに会ってチャットできる
+			<text name="allow_see_label">
+				他の区画にいるアバターがこの区画にいるアバターに会ってチャットできます
 			</text>
 			<check_box label="アバターを表示" name="SeeAvatarsCheck" tool_tip="他の区画のアバターが、この区画にいるアバターに会ってチャットすることを許可し、あなたもそれらアバターに会ってチャットできるようにします。"/>
 			<text name="landing_point">
@@ -458,9 +467,12 @@
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="禁止" name="BanCheck">
-					常に禁止する （[COUNT] 人、最大 [MAX] 人）
+					禁止する （[COUNT] 人、最大 [MAX] 人）
 				</text>
-				<name_list name="BannedList" tool_tip="(合計 [LISTED] 人、最大 [MAX] 人）"/>
+				<name_list name="BannedList" tool_tip="(合計 [LISTED] 人、最大 [MAX] 人）">
+					<columns label="名前" name="name"/>
+					<columns label="期間" name="duration"/>
+				</name_list>
 				<button label="追加" name="add_banned"/>
 				<button label="削除" label_selected="削除" name="remove_banned"/>
 			</panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_ban_duration.xml b/indra/newview/skins/default/xui/ja/floater_ban_duration.xml
new file mode 100644
index 0000000000..a9d00b0116
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_ban_duration.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="ban_duration" title="禁止期間">
+	<text name="duration_textbox">
+		禁止期間：
+	</text>
+	<radio_group name="ban_duration_radio">
+		<radio_item label="常時" name="always_radio">
+			常時
+		</radio_item>
+		<radio_item label="一時的" name="temporary_radio">
+			一時的
+		</radio_item>
+	</radio_group>
+	<text name="hours_textbox">
+		時間
+	</text>
+	<button label="Ok" name="ok_btn"/>
+	<button label="キャンセル" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_gesture.xml b/indra/newview/skins/default/xui/ja/floater_gesture.xml
index 1ed5ad31db..b5b1efe386 100644
--- a/indra/newview/skins/default/xui/ja/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_gesture.xml
@@ -21,7 +21,7 @@
 		<button name="activate_btn" tool_tip="選択したジェスチャーのアクティベートの有無"/>
 		<button name="del_btn" tool_tip="このジェスチャーを削除"/>
 	</panel>
-	<button label="編集" name="edit_btn"/>
-	<button label="再生" name="play_btn"/>
+	<button label="編集" name="edit_btn" tool_tip="選択済みのジェスチャーを編集するためにウィンドウを開ける。"/>
+	<button label="再生" name="play_btn" tool_tip="インワールドで選択済みのジェスチャーを実行する。"/>
 	<button label="停止" name="stop_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
index ff7814ffb7..c28afa4c98 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
@@ -43,6 +43,7 @@
 	<check_box label="異方的フィルタリング (有効にすると速度が低下)" name="ani"/>
 	<check_box initial_value="true" label="OpenGL Vertex Buffer Objects を有効化" name="vbo" tool_tip="最新のハードウェアでこのオプションを有効にするとパフォーマンスが向上します。ただし、古いハードウェアでは VBO の実装が貧弱なため、このオプションを有効にするとクラッシュする場合があります。"/>
 	<check_box initial_value="true" label="テクスチャ圧縮の有効化 (再起動後に反映)" name="texture compression" tool_tip="ビデオメモリでテクスチャを圧縮すると、一部のカラー品質を犠牲にして、高解像度のテクスチャをロードできます。"/>
+	<check_box initial_value="true" label="HiDPI 表示のためにサポートを有効にする（再起動が必要）" name="use HiDPI" tool_tip="高画質の描画のために OpenGL を有効にする"/>
 	<text name="antialiasing label">
 		アンチエイリアシング：
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
index ae8ae9f7b5..ef7e90a6bc 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
@@ -15,6 +15,7 @@
 	<text_editor name="Notecard Editor">
 		ローディング．．．
 	</text_editor>
+	<button label="編集..." label_selected="編集" name="Edit"/>
 	<button label="保存" label_selected="保存" name="Save"/>
 	<button label="削除" label_selected="削除" name="Delete"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
index 7631cd7aba..4ddd0d2605 100644
--- a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
@@ -76,7 +76,7 @@
 		<combo_box.item label="土地 &gt; 不法侵入 &gt; オブジェクトまたはテクスチャ" name="Land__Encroachment__Objects_textures"/>
 		<combo_box.item label="土地＞不法侵入＞パーティクル" name="Land__Encroachment__Particles"/>
 		<combo_box.item label="土地＞不法侵入＞樹木/植物" name="Land__Encroachment__Trees_plants"/>
-		<combo_box.item label="ゲーミング ポリシー違反" name="Wagering_gambling"/>
+		<combo_box.item label="スキルゲーミング ポリシー違反" name="Wagering_gambling"/>
 		<combo_box.item label="その他" name="Other"/>
 	</combo_box>
 	<text name="abuser_name_title">
diff --git a/indra/newview/skins/default/xui/ja/panel_group_general.xml b/indra/newview/skins/default/xui/ja/panel_group_general.xml
index a1bfb67823..aab536f653 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_general.xml
@@ -46,7 +46,7 @@
 		<check_box label="誰でも入会できます" name="open_enrollement" tool_tip="招待されなくても新規メンバーが加入できるかどうかを設定します。"/>
 		<check_box label="入会費がかかります" name="check_enrollment_fee" tool_tip="入会費が必要かどうかを設定します。"/>
 		<spinner label="L$" name="spin_enrollment_fee" tool_tip="「入会費」にチェックが入っている場合、新規メンバーは指定された入会費を支払わなければグループに入れません。"/>
-		<combo_box name="group_mature_check" tool_tip="あなたのグループに「Moderate」にレート設定された情報があるかどうかを設定します">
+		<combo_box name="group_mature_check" tool_tip="レーティング区分は、グループ内でどのようなコンテンツや行動が許されるかを指定するものです">
 			<combo_item name="select_mature">
 				- レーティング区分を指定 -
 			</combo_item>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_access.xml b/indra/newview/skins/default/xui/ja/panel_region_access.xml
index c0612dd150..34809688d0 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_access.xml
@@ -14,6 +14,7 @@
 		<panel label="許可" name="allowed_panel">
 			<panel label="top_panel" name="allowed_search_panel">
 				<filter_editor label="許可されたエージェントを検索" name="allowed_search_input"/>
+				<button label="コピー" name="copy_allowed_list_btn"/>
 			</panel>
 			<text name="allow_resident_label">
 				常に許可：
@@ -27,6 +28,7 @@
 		<panel label="許可されたグループ" name="allowed_groups_panel">
 			<panel label="top_panel" name="allowed_group_search_panel">
 				<filter_editor label="許可されたグループを検索" name="allowed_group_search_input"/>
+				<button label="コピー" name="copy_allowed_group_list_btn"/>
 			</panel>
 			<text name="allow_group_label">
 				常に許可されたグループ：
@@ -40,6 +42,7 @@
 		<panel label="禁止" name="banned_panel">
 			<panel label="top_panel" name="banned_search_panel">
 				<filter_editor label="禁止されたエージェントを検索" name="banned_search_input"/>
+				<button label="コピー" name="copy_banned_list_btn"/>
 			</panel>
 			<text name="ban_resident_label">
 				常に禁止：
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 497ea649d1..20dcedaa2a 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -76,6 +76,9 @@ LOD 係数: [LOD_FACTOR]
 テクスチャメモリ: [TEXTURE_MEMORY]MB
 VFS（キャッシュ）作成時間: [VFS_TIME]
 	</string>
+	<string name="AboutOSXHiDPI">
+		HiDPI 表示モード: [HIDPI]
+	</string>
 	<string name="AboutLibs">
 		J2C デコーダバージョン： [J2C_VERSION] 
 オーディオドライババージョン： [AUDIO_DRIVER_VERSION] 
@@ -1477,6 +1480,15 @@ support@secondlife.com にお問い合わせください。
 	<string name="MarketplaceURL_LearnMore">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more
 	</string>
+	<string name="InventoryPlayAnimationTooltip">
+		[再生] オプションでウィンドウを開ける。
+	</string>
+	<string name="InventoryPlayGestureTooltip">
+		インワールドで選択済みのジェスチャーを実行する。
+	</string>
+	<string name="InventoryPlaySoundTooltip">
+		[再生] オプションでウィンドウを開ける。
+	</string>
 	<string name="InventoryOutboxNotMerchantTitle">
 		マーケットプレイスでは誰でもアイテムを売ることができます。
 	</string>
@@ -5397,9 +5409,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="Command_Destinations_Label">
 		行き先
 	</string>
-	<string name="Command_Facebook_Label">
-		Facebook
-	</string>
 	<string name="Command_Flickr_Label">
 		Flickr
 	</string>
@@ -5493,9 +5502,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="Command_Destinations_Tooltip">
 		行ってみたい場所
 	</string>
-	<string name="Command_Facebook_Tooltip">
-		Facebook へ投稿
-	</string>
 	<string name="Command_Flickr_Tooltip">
 		Flickr にアップロード
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml
index 6039b7fd4a..ef71baa0b6 100644
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -9,6 +9,12 @@
 	<floater.string name="maturity_icon_adult">
 		&quot;Parcel_R_Dark&quot;
 	</floater.string>
+	<floater.string name="Hours">
+		[HOURS] hrs.
+	</floater.string>
+	<floater.string name="Hour">
+		hr.
+	</floater.string>
 	<floater.string name="Minutes">
 		[MINUTES] min.
 	</floater.string>
@@ -21,6 +27,9 @@
 	<floater.string name="Remaining">
 		faltam
 	</floater.string>
+	<floater.string name="Always">
+		Sempre
+	</floater.string>
 	<tab_container name="landtab">
 		<panel label="GERAL" name="land_general_panel">
 			<panel.string name="new users only">
@@ -318,18 +327,18 @@ Apenas lotes maiores podem ser listados na busca.
 			<text name="allow_label2">
 				Criar objetos:
 			</text>
-			<check_box label="Residentes" name="edit objects check"/>
-			<check_box label="Grupo" name="edit group objects check"/>
+			<check_box label="Residentes" name="edit objects check" tool_tip="Se verificado, os Residentes podem criar e mover objetos no seu terreno."/>
+			<check_box label="Grupo" name="edit group objects check" tool_tip="Se verificado, o grupo de membros do terreno podem criar e adicionar objetos no seu terreno."/>
 			<text name="allow_label3">
 				Entrada de objetos:
 			</text>
-			<check_box label="Residentes" name="all object entry check"/>
-			<check_box label="Grupo" name="group object entry check"/>
+			<check_box label="Residentes" name="all object entry check" tool_tip="Se verificado, os Residentes podem mover objetos existentes de outros terrenos para esse terreno."/>
+			<check_box label="Grupo" name="group object entry check" tool_tip="Se verificado, o grupo de membros do terreno podem mover os objetos existentes de outros terrenos para esse terreno."/>
 			<text name="allow_label4">
 				Executar scripts:
 			</text>
-			<check_box label="Residentes" name="check other scripts"/>
-			<check_box label="Grupo" name="check group scripts"/>
+			<check_box label="Residentes" name="check other scripts" tool_tip="Se verificado, os Residentes podem rodar scripts no seu terreno, incluindo anexos."/>
+			<check_box label="Grupo" name="check group scripts" tool_tip="Se verificado, o grupo de membros do terreno podem rodar scripts no seu terreno, incluindo anexos."/>
 			<check_box label="Seguro (sem danos)" name="check safe" tool_tip="Se ativado, ajusta o terreno para Seguro, impedindo lutas com danos. Se não ativado, lutas com danos é habilitado."/>
 			<check_box label="Proibido empurrar" name="PushRestrictCheck" tool_tip="Evita scripts que empurram. Ativar essa opção ajuda a prevenir comportamentos desordeiros no seu terreno."/>
 			<check_box label="Mostrar terreno nos resultados de busca (L$30/semana)" name="ShowDirectoryCheck" tool_tip="Permitir que as pessoas vejam este terreno nos resultados de busca"/>
@@ -353,7 +362,7 @@ Apenas lotes maiores podem ser listados na busca.
 				Foto:
 			</text>
 			<texture_picker label="" name="snapshot_ctrl" tool_tip="Clique para escolher uma imagem"/>
-			<text name="allow_label5">
+			<text name="allow_see_label">
 				Avatares em outros lotes podem ver e conversar com avatares neste lote
 			</text>
 			<check_box label="Ver avatares" name="SeeAvatarsCheck" tool_tip="Permite que os avatares em outros lotes vejam e batam papo com avatares neste lote. Você poderá vê-los e conversar com eles."/>
@@ -459,9 +468,12 @@ Mídia:
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="Ban" name="BanCheck">
-					Sempre banido ([COUNT], máx: [MAX])
+					Banido ([COUNT], máx: [MAX])
 				</text>
-				<name_list name="BannedList" tool_tip="(Total [LISTED], máx de [MAX])"/>
+				<name_list name="BannedList" tool_tip="(Total [LISTED], máx de [MAX])">
+					<columns label="Nome" name="name"/>
+					<columns label="Duração" name="duration"/>
+				</name_list>
 				<button label="Adicionar" name="add_banned"/>
 				<button label="Tirar" label_selected="Tirar" name="remove_banned"/>
 			</panel>
diff --git a/indra/newview/skins/default/xui/pt/floater_ban_duration.xml b/indra/newview/skins/default/xui/pt/floater_ban_duration.xml
new file mode 100644
index 0000000000..1b2bab88c7
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_ban_duration.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="ban_duration" title="Duração do banimento">
+	<text name="duration_textbox">
+		Duração do banimento:
+	</text>
+	<radio_group name="ban_duration_radio">
+		<radio_item label="Sempre" name="always_radio">
+			Sempre
+		</radio_item>
+		<radio_item label="Temporário" name="temporary_radio">
+			Temporário
+		</radio_item>
+	</radio_group>
+	<text name="hours_textbox">
+		horas.
+	</text>
+	<button label="Ok" name="ok_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_gesture.xml b/indra/newview/skins/default/xui/pt/floater_gesture.xml
index 2e5b92aaf7..308d3e7d88 100644
--- a/indra/newview/skins/default/xui/pt/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/pt/floater_gesture.xml
@@ -20,7 +20,7 @@
 		<button name="activate_btn" tool_tip="Ativar/Desativar gesto selecionado"/>
 		<button name="del_btn" tool_tip="Excluir este gesto"/>
 	</panel>
-	<button label="Editar" name="edit_btn"/>
-	<button label="Executar" name="play_btn"/>
+	<button label="Editar" name="edit_btn" tool_tip="Abrir janela para edição do gesto selecionado."/>
+	<button label="Executar" name="play_btn" tool_tip="Executar o gesto selecionado no mundo."/>
 	<button label="Parar" name="stop_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml
index 89b3781151..c5039267ca 100644
--- a/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml
@@ -43,6 +43,7 @@
 	<check_box label="Filtro anisotrópico (mais lento quando ativado)" name="ani"/>
 	<check_box initial_value="true" label="Ativar Vertex Buffer Objects de OpenGL" name="vbo" tool_tip="Ativar isso em hardware moderno melhora o desempenho.  Entretanto, hardwares mais antigos normalmente implantam mal os VBOs. A ativação dessa configuração pode travar sua máquina."/>
 	<check_box initial_value="true" label="Habilitar compressão da textura (requer reinício)" name="texture compression" tool_tip="Comprime as texturas na memória de vídeo, permitindo o carregamento de texturas de maior resolução em detrimento da qualidade da cor."/>
+	<check_box initial_value="true" label="Habilitar suporte para exibição HiDPI (é necessário reiniciar)" name="use HiDPI" tool_tip="Habilitar o OpenGL para Desenho de alta-resolução."/>
 	<text name="antialiasing label">
 		Antialiasing:
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
index d094c1b63a..9885ee2a23 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
@@ -15,6 +15,7 @@
 	<text_editor name="Notecard Editor">
 		Carregando...
 	</text_editor>
+	<button label="Editar..." label_selected="Editar" name="Edit"/>
 	<button label="Salvar" label_selected="Salvar" name="Save"/>
 	<button label="Excluir" label_selected="Excluir" name="Delete"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
index f30201fc33..1429fe183c 100644
--- a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
@@ -76,7 +76,7 @@
 		<combo_box.item label="Terreno &gt; Invasão &gt; Objetos ou texturas" name="Land__Encroachment__Objects_textures"/>
 		<combo_box.item label="Terra &gt; Invasão &gt; Partículas" name="Land__Encroachment__Particles"/>
 		<combo_box.item label="Terra &gt; Violação &gt; Árvores/plantas" name="Land__Encroachment__Trees_plants"/>
-		<combo_box.item label="Violação da política sobre jogos" name="Wagering_gambling"/>
+		<combo_box.item label="Ignorar o jogo de violação da política" name="Wagering_gambling"/>
 		<combo_box.item label="Outro" name="Other"/>
 	</combo_box>
 	<text name="abuser_name_title">
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 478af96e95..530a272dbb 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -1904,7 +1904,7 @@ Isto mudará milhares de regiões e fará o spaceserver soluçar.
 		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as Propriedades" yestext="Esta Propriedade"/>
 	</notification>
 	<notification label="Selecione a propriedade" name="EstateBannedAgentRemove">
-		Remover este Residente da lista de banimento para acessar este estado somente ou para [ALL_ESTATES]?
+		Remover este Residente da lista de banimento para acessar esta propriedade somente ou para [ALL_ESTATES]?
 		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as Propriedades" yestext="Esta Propriedade"/>
 	</notification>
 	<notification label="Selecione a propriedade" name="EstateManagerAdd">
diff --git a/indra/newview/skins/default/xui/pt/panel_group_general.xml b/indra/newview/skins/default/xui/pt/panel_group_general.xml
index b634ec3f64..64a7d13fdb 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_general.xml
@@ -46,7 +46,7 @@ Para obter mais ajuda, passe o mouse sobre as opções.
 		<check_box label="Qualquer um pode entrar" name="open_enrollement" tool_tip="Controla a entrada de novos membros, com ou sem convite."/>
 		<check_box label="Taxa de inscrição" name="check_enrollment_fee" tool_tip="Controla a cobrança de uma taxa de associação ao grupo."/>
 		<spinner label="L$" left_delta="120" name="spin_enrollment_fee" tool_tip="Se a opção &apos;Taxa de associação&apos; estiver marcada, novos membros precisam pagar o valor definido para entrar no grupo." width="60"/>
-		<combo_box name="group_mature_check" tool_tip="Define se os dados do seu grupo são conteúdo moderado." width="170">
+		<combo_box name="group_mature_check" tool_tip="Os níveis de maturidade determinam o tipo de conteúdo e comportamento permitidos em um grupo" width="170">
 			<combo_item name="select_mature">
 				- Selecione o nível de maturidade -
 			</combo_item>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_access.xml b/indra/newview/skins/default/xui/pt/panel_region_access.xml
index cc2136a459..c6273ea70d 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_access.xml
@@ -14,6 +14,7 @@
 		<panel label="PERMITIDO" name="allowed_panel">
 			<panel label="top_panel" name="allowed_search_panel">
 				<filter_editor label="Buscar agentes permitidos" name="allowed_search_input"/>
+				<button label="Copiar" name="copy_allowed_list_btn"/>
 			</panel>
 			<text name="allow_resident_label">
 				Sempre permitido:
@@ -27,6 +28,7 @@
 		<panel label="GRUPOS PERMITIDOS" name="allowed_groups_panel">
 			<panel label="top_panel" name="allowed_group_search_panel">
 				<filter_editor label="Buscar grupos permitidos" name="allowed_group_search_input"/>
+				<button label="Copiar" name="copy_allowed_group_list_btn"/>
 			</panel>
 			<text name="allow_group_label">
 				Grupos sempre permitidos:
@@ -40,6 +42,7 @@
 		<panel label="BANIDO" name="banned_panel">
 			<panel label="top_panel" name="banned_search_panel">
 				<filter_editor label="Buscar agentes banidos" name="banned_search_input"/>
+				<button label="Copiar" name="copy_banned_list_btn"/>
 			</panel>
 			<text name="ban_resident_label">
 				Sempre banido:
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 3075113480..cd5639711f 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -67,6 +67,9 @@ Modelo avançado de luzes: [GPU_SHADERS]
 Memória de textura: [TEXTURE_MEMORY]MB
 VFS (cache) tempo de criação: [VFS_TIME]
 	</string>
+	<string name="AboutOSXHiDPI">
+		HiDPI modo de exibição: [HIDPI]
+	</string>
 	<string name="AboutLibs">
 		Versão do J2C Decoder: [J2C_VERSION] 
 Versão do driver de áudio: [AUDIO_DRIVER_VERSION]
@@ -1428,6 +1431,15 @@ http://secondlife.com/support para ajuda ao resolver este problema.
 	<string name="MarketplaceURL_LearnMore">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more
 	</string>
+	<string name="InventoryPlayAnimationTooltip">
+		Abrir a janela com as opções do Jogo.
+	</string>
+	<string name="InventoryPlayGestureTooltip">
+		Executar o gesto selecionado no mundo.
+	</string>
+	<string name="InventoryPlaySoundTooltip">
+		Abrir a janela com as opções do Jogo.
+	</string>
 	<string name="InventoryOutboxNotMerchantTitle">
 		Qualquer um pode vender itens no Mercado.
 	</string>
@@ -5273,9 +5285,6 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="Command_Destinations_Label">
 		Destinos
 	</string>
-	<string name="Command_Facebook_Label">
-		Facebook
-	</string>
 	<string name="Command_Flickr_Label">
 		Flickr
 	</string>
@@ -5369,9 +5378,6 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="Command_Destinations_Tooltip">
 		Destinos de interesse
 	</string>
-	<string name="Command_Facebook_Tooltip">
-		Publicar no Facebook
-	</string>
 	<string name="Command_Flickr_Tooltip">
 		Carregar no Flickr
 	</string>
diff --git a/indra/newview/skins/default/xui/ru/floater_about_land.xml b/indra/newview/skins/default/xui/ru/floater_about_land.xml
index 50402633f2..1ae6df76d9 100644
--- a/indra/newview/skins/default/xui/ru/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about_land.xml
@@ -9,6 +9,12 @@
 	<floater.string name="maturity_icon_adult">
 		&quot;Parcel_R_Dark&quot;
 	</floater.string>
+	<floater.string name="Hours">
+		\[HOURS] ч
+	</floater.string>
+	<floater.string name="Hour">
+		ч
+	</floater.string>
 	<floater.string name="Minutes">
 		[MINUTES] мин
 	</floater.string>
@@ -21,6 +27,9 @@
 	<floater.string name="Remaining">
 		осталось
 	</floater.string>
+	<floater.string name="Always">
+		Всегда
+	</floater.string>
 	<tab_container name="landtab">
 		<panel label="ОСНОВНЫЕ" name="land_general_panel">
 			<panel.string name="new users only">
@@ -316,18 +325,18 @@
 			<text name="allow_label2">
 				Строительство:
 			</text>
-			<check_box label="Все" name="edit objects check"/>
-			<check_box label="Группа" name="edit group objects check"/>
+			<check_box label="Все" name="edit objects check" tool_tip="Если установлен флажок, жители могут создавать и выкладывать объекты на вашей земле."/>
+			<check_box label="Группа" name="edit group objects check" tool_tip="Если установлен флажок, то жители могут создавать и выкладывать объекты на вашей земле."/>
 			<text name="allow_label3">
 				Проникновение объектов:
 			</text>
-			<check_box label="Все" name="all object entry check"/>
-			<check_box label="Группа" name="group object entry check"/>
+			<check_box label="Все" name="all object entry check" tool_tip="Если установлен флажок, то жители могут перемещать существующие объекты из других участков на этот участок."/>
+			<check_box label="Группа" name="group object entry check" tool_tip="Если установлен флажок, то члены группы участка могут перемещать существующие объекты из других участков на этот участок."/>
 			<text name="allow_label4">
 				Запускать скрипты:
 			</text>
-			<check_box label="Все" name="check other scripts"/>
-			<check_box label="Группа" name="check group scripts"/>
+			<check_box label="Все" name="check other scripts" tool_tip="Если установлен флажок, то жители могут выполнять скрипты на вашем участке, включая приложения."/>
+			<check_box label="Группа" name="check group scripts" tool_tip="Если установлен флажок, то члены группы могут выполнять скрипты на вашем участке, включая приложения."/>
 			<check_box label="Безопасно (нет повреждений)" name="check safe" tool_tip="Если отмечено, то земля считается безопасной, отключены боевые повреждения. Если не отмечено, то боевые повреждения включены."/>
 			<check_box label="Не толкать" name="PushRestrictCheck" tool_tip="Запрещает скриптам функцию толкания. Этот параметр может оказаться полезным для предотвращения нежелательного поведения на вашей земле."/>
 			<check_box label="Показать место в поиске (L$30/неделя)" name="ShowDirectoryCheck" tool_tip="Позволить людям видеть участок в результатах поиска"/>
@@ -351,7 +360,7 @@
 				Снимок:
 			</text>
 			<texture_picker name="snapshot_ctrl" tool_tip="Щелкните для выбора изображения"/>
-			<text name="allow_label5">
+			<text name="allow_see_label">
 				Аватары с других участков могут видеть аватары на этом участке и общаться с ними
 			</text>
 			<check_box label="Видны аватары" name="SeeAvatarsCheck" tool_tip="Аватары с других участков смогут видеть аватары на этом участке и общаться с ними в чате, а вы также сможете видеть их и общаться с ними."/>
@@ -454,9 +463,12 @@
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="Бан" name="BanCheck">
-					Всегда заблокировано ([COUNT], макс. [MAX])
+					Заблокировано ([COUNT], макс. [MAX])
 				</text>
-				<name_list name="BannedList" tool_tip="([LISTED] в списке, [MAX] максимум)"/>
+				<name_list name="BannedList" tool_tip="([LISTED] в списке, [MAX] максимум)">
+					<columns label="Имя" name="name"/>
+					<columns label="Продолжительность" name="duration"/>
+				</name_list>
 				<button label="Добавить" name="add_banned"/>
 				<button label="Удалить" label_selected="Удалить" name="remove_banned"/>
 			</panel>
diff --git a/indra/newview/skins/default/xui/ru/floater_ban_duration.xml b/indra/newview/skins/default/xui/ru/floater_ban_duration.xml
new file mode 100644
index 0000000000..c4238cfa77
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_ban_duration.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="ban_duration" title="Длительность запрета">
+	<text name="duration_textbox">
+		Длительность запрета:
+	</text>
+	<radio_group name="ban_duration_radio">
+		<radio_item label="Всегда" name="always_radio">
+			Всегда
+		</radio_item>
+		<radio_item label="Временно" name="temporary_radio">
+			Временно
+		</radio_item>
+	</radio_group>
+	<text name="hours_textbox">
+		часы
+	</text>
+	<button label="ОК" name="ok_btn"/>
+	<button label="Отмена" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_gesture.xml b/indra/newview/skins/default/xui/ru/floater_gesture.xml
index 759d81b2c6..c9b85acff8 100644
--- a/indra/newview/skins/default/xui/ru/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/ru/floater_gesture.xml
@@ -20,7 +20,7 @@
 		<button name="activate_btn" tool_tip="Активировать/деактивировать выбранный жест"/>
 		<button name="del_btn" tool_tip="Удалить этот жест"/>
 	</panel>
-	<button label="Изменить" name="edit_btn"/>
-	<button label="Проиграть" name="play_btn"/>
+	<button label="Изменить" name="edit_btn" tool_tip="Откройте окно для редактирования выбранного жеста."/>
+	<button label="Проиграть" name="play_btn" tool_tip="Выполните выбранный жест в игровом мире."/>
 	<button label="Стоп" name="stop_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml
index efad8678b6..fc6b6a173e 100644
--- a/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml
@@ -43,6 +43,7 @@
 	<check_box label="Анизотропная фильтрация (медленнее, если включено)" name="ani"/>
 	<check_box initial_value="true" label="Включить объекты вершинных буферов OpenGL" name="vbo" tool_tip="Включение этого параметра на современном оборудовании даст увеличение производительности.  Однако на старом оборудовании это может привести к сбою приложения."/>
 	<check_box initial_value="true" label="Разрешить сжатие текстур (требует перезагрузки)" name="texture compression" tool_tip="Сжатие текстур в видеопамяти, что позволяет загружать текстуры большего размера за счет некоторого падения качества цвета."/>
+	<check_box initial_value="true" label="Активировать поддержку отображения HiDPI (требуется перезапуск)" name="use HiDPI" tool_tip="Активировать OpenGL для рисования с высоким разрешением."/>
 	<text name="antialiasing label">
 		Сглаживание:
 	</text>
diff --git a/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml b/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml
index 2f39d4a4a4..ffff72f17e 100644
--- a/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml
@@ -15,6 +15,7 @@
 	<text_editor name="Notecard Editor">
 		Загрузка...
 	</text_editor>
+	<button label="Pедактировать..." label_selected="Редактировать" name="Edit"/>
 	<button label="Сохранить" label_selected="Сохранить" name="Save"/>
 	<button label="Удалить" label_selected="Удалить" name="Delete"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_report_abuse.xml b/indra/newview/skins/default/xui/ru/floater_report_abuse.xml
index 67d847aa6b..3ac8cb74b4 100644
--- a/indra/newview/skins/default/xui/ru/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/ru/floater_report_abuse.xml
@@ -67,7 +67,7 @@
 		<combo_box.item label="Земля &gt; Посягательство &gt; Объекты или текстуры" name="Land__Encroachment__Objects_textures"/>
 		<combo_box.item label="Земля &gt; Посягательство &gt; Частицы" name="Land__Encroachment__Particles"/>
 		<combo_box.item label="Земля &gt; Посягательство &gt; Деревья/растения" name="Land__Encroachment__Trees_plants"/>
-		<combo_box.item label="Нарушение политики игр" name="Wagering_gambling"/>
+		<combo_box.item label="Нарушение правил игр на ловкость" name="Wagering_gambling"/>
 		<combo_box.item label="Другое" name="Other"/>
 	</combo_box>
 	<text name="abuser_name_title">
diff --git a/indra/newview/skins/default/xui/ru/panel_group_general.xml b/indra/newview/skins/default/xui/ru/panel_group_general.xml
index ba38dbf89e..ee3a74103f 100644
--- a/indra/newview/skins/default/xui/ru/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_general.xml
@@ -44,7 +44,7 @@
 		<check_box label="Открытая регистрация" name="open_enrollement" tool_tip="Устанавливается, если в этой группе можно зарегистрироваться без приглашения."/>
 		<check_box label="Платная регистрация" name="check_enrollment_fee" tool_tip="Устанавливается, если в этой группе требуется оплата за вступление."/>
 		<spinner label="L$" name="spin_enrollment_fee" tool_tip="Новые участники должны будут оплатить взнос, если регистрация платная."/>
-		<combo_box name="group_mature_check" tool_tip="Устанавливает, содержит ли группа информацию категории умеренной дозволенности">
+		<combo_box name="group_mature_check" tool_tip="Рейтинги зрелости определяют тип контента и поведение, разрешенное в группе">
 			<combo_item name="select_mature">
 				- Выберите рейтинг зрелости -
 			</combo_item>
diff --git a/indra/newview/skins/default/xui/ru/panel_region_access.xml b/indra/newview/skins/default/xui/ru/panel_region_access.xml
index 48adfbcd95..e2349f4c83 100644
--- a/indra/newview/skins/default/xui/ru/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_access.xml
@@ -14,6 +14,7 @@
 		<panel label="РАЗРЕШЕННЫЕ" name="allowed_panel">
 			<panel label="top_panel" name="allowed_search_panel">
 				<filter_editor label="Поиск допущенных агентов" name="allowed_search_input"/>
+				<button label="Копировать" name="copy_allowed_list_btn"/>
 			</panel>
 			<text name="allow_resident_label">
 				Разрешено всегда:
@@ -27,6 +28,7 @@
 		<panel label="ДОПУЩЕННЫЕ ГРУППЫ" name="allowed_groups_panel">
 			<panel label="top_panel" name="allowed_group_search_panel">
 				<filter_editor label="Поиск допущенных групп" name="allowed_group_search_input"/>
+				<button label="Копировать" name="copy_allowed_group_list_btn"/>
 			</panel>
 			<text name="allow_group_label">
 				Допуск групп всегда разрешен:
@@ -40,6 +42,7 @@
 		<panel label="ЗАБЛОКИРОВАНЫ" name="banned_panel">
 			<panel label="top_panel" name="banned_search_panel">
 				<filter_editor label="Поиск заблокированных агентов" name="banned_search_input"/>
+				<button label="Копировать" name="copy_banned_list_btn"/>
 			</panel>
 			<text name="ban_resident_label">
 				Всегда заблокированы:
diff --git a/indra/newview/skins/default/xui/ru/panel_region_estate.xml b/indra/newview/skins/default/xui/ru/panel_region_estate.xml
index 5789058b3b..feeac0464a 100644
--- a/indra/newview/skins/default/xui/ru/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_estate.xml
@@ -16,7 +16,7 @@
 		(неизвестно)
 	</text>
 	<radio_group name="externally_visible_radio">
-		<radio_item label="Разрешено только жителям и группам, перечисленным на вкладке доступа" name="estate_restricted_access"/>
+		<radio_item label="Разрешено только жителям и группам, перечисленных на вкладке доступа" name="estate_restricted_access"/>
 		<radio_item label="Доступ открыт для всех" name="estate_public_access"/>
 	</radio_group>
 	<check_box label="Должен быть 18 и старше" name="limit_age_verified" tool_tip="Доступ к этому землевладению имеют только жители 18 лет и старше. Более подробная информация находится здесь: [SUPPORT_SITE]."/>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 9192ebf601..9c01de2f1b 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -76,6 +76,9 @@ SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 Память текстур: [TEXTURE_MEMORY] МБ
 Время создания VFS (кэш): [VFS_TIME]
 	</string>
+	<string name="AboutOSXHiDPI">
+		Режим отображения HiDPI: [HIDPI]
+	</string>
 	<string name="AboutLibs">
 		Версия декодера J2C: [J2C_VERSION] 
 Версия аудиодрайвера: [AUDIO_DRIVER_VERSION] 
@@ -1475,6 +1478,15 @@ support@secondlife.com.
 	<string name="MarketplaceURL_LearnMore">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more
 	</string>
+	<string name="InventoryPlayAnimationTooltip">
+		Откройте окно с настройками игры.
+	</string>
+	<string name="InventoryPlayGestureTooltip">
+		Выполните выбранный жест в игровом мире.
+	</string>
+	<string name="InventoryPlaySoundTooltip">
+		Откройте окно с настройками игры.
+	</string>
 	<string name="InventoryOutboxNotMerchantTitle">
 		Продавать вещи в торговом центре может кто угодно.
 	</string>
@@ -5405,9 +5417,6 @@ support@secondlife.com.
 	<string name="Command_Destinations_Label">
 		Пункты
 	</string>
-	<string name="Command_Facebook_Label">
-		Facebook
-	</string>
 	<string name="Command_Flickr_Label">
 		Flickr
 	</string>
@@ -5501,9 +5510,6 @@ support@secondlife.com.
 	<string name="Command_Destinations_Tooltip">
 		Интересные места
 	</string>
-	<string name="Command_Facebook_Tooltip">
-		Опубликовать в Facebook
-	</string>
 	<string name="Command_Flickr_Tooltip">
 		Загрузить на Flickr
 	</string>
diff --git a/indra/newview/skins/default/xui/tr/floater_about_land.xml b/indra/newview/skins/default/xui/tr/floater_about_land.xml
index 1f4decb056..48b16e2fde 100644
--- a/indra/newview/skins/default/xui/tr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about_land.xml
@@ -9,6 +9,12 @@
 	<floater.string name="maturity_icon_adult">
 		&quot;Parcel_R_Dark&quot;
 	</floater.string>
+	<floater.string name="Hours">
+		[HOURS] sa
+	</floater.string>
+	<floater.string name="Hour">
+		sa
+	</floater.string>
 	<floater.string name="Minutes">
 		[MINUTES] dak.
 	</floater.string>
@@ -21,6 +27,9 @@
 	<floater.string name="Remaining">
 		kaldı
 	</floater.string>
+	<floater.string name="Always">
+		Her zaman
+	</floater.string>
 	<tab_container name="landtab">
 		<panel label="GENEL" name="land_general_panel">
 			<panel.string name="new users only">
@@ -316,18 +325,18 @@ Sadece büyük parseller aramada görünür.
 			<text name="allow_label2">
 				İnşa Et:
 			</text>
-			<check_box label="Herkes" name="edit objects check"/>
-			<check_box label="Grup" name="edit group objects check"/>
+			<check_box label="Herkes" name="edit objects check" tool_tip="İşaretlendiğinde, Sakinler arazinizde nesneler oluşturabilir ve nesneleri canlandırabilir."/>
+			<check_box label="Grup" name="edit group objects check" tool_tip="İşaretlendiğinde, parsel grubu üyeleri arazinizde nesneler oluşturabilir ve nesneleri canlandırabilir."/>
 			<text name="allow_label3">
 				Nesne Girişi:
 			</text>
-			<check_box label="Herkes" name="all object entry check"/>
-			<check_box label="Grup" name="group object entry check"/>
+			<check_box label="Herkes" name="all object entry check" tool_tip="İşaretlendiğinde, Sakinler mevcut nesneleri diğer parsellerden bu parsele taşıyabilir."/>
+			<check_box label="Grup" name="group object entry check" tool_tip="İşaretlendiğinde, parsel grubu üyeleri mevcut nesneleri diğer parsellerden bu parsele taşıyabilir."/>
 			<text name="allow_label4">
 				Komut Dosyalarını Çalıştır:
 			</text>
-			<check_box label="Herkes" name="check other scripts"/>
-			<check_box label="Grup" name="check group scripts"/>
+			<check_box label="Herkes" name="check other scripts" tool_tip="İşaretlendiğinde, Sakinler parselinizde aksesuarlar dahil olmak üzere komut dosyalarını çalıştırabilir."/>
+			<check_box label="Grup" name="check group scripts" tool_tip="İşaretlendiğinde, parsel grubu üyeleri parselinizde aksesuarlar dahil olmak üzere komut dosyalarını çalıştırabilir."/>
 			<check_box label="Güvenli (hasar yok)" name="check safe" tool_tip="İşaretliyse, araziyi Güvenli moda getirerek hasar çarpışmasını etkinsizleştirir İşaretli değilse hasar çarpışması etkinleşir."/>
 			<check_box label="İtme Yok" name="PushRestrictCheck" tool_tip="Komut dosyalarının itmesini önler Bu seçeneğin işaretlenmesi arazinizdeki bozucu davranışları önlemeye yardımcı olabilir."/>
 			<check_box label="Konumu Arama sonuçlarında göster (L$30/hafta)" name="ShowDirectoryCheck" tool_tip="Arama sonuçlarında bu parsel görünsün"/>
@@ -351,8 +360,8 @@ Sadece büyük parseller aramada görünür.
 				Anlık Görüntü:
 			</text>
 			<texture_picker name="snapshot_ctrl" tool_tip="Bir resim seçmek için tıklayın"/>
-			<text name="allow_label5">
-				Başka parsellerdeki avatarlar bu parseldeki avatarları görebilir ve onlarla sohbet edebilir
+			<text name="allow_see_label">
+				Diğer parsellerdeki avatarlar bu parseldeki avatarları görebilir ve onlarla sohbet edebilir
 			</text>
 			<check_box label="Avatarları Gör" name="SeeAvatarsCheck" tool_tip="Diğer parsellerdeki avatarların bu parseldeki avatarları görmesine ve onlarla sohbet etmesine, sizin de onları görüp, onlarla sohbet etmenize imkan tanır."/>
 			<text name="landing_point">
@@ -454,9 +463,12 @@ Sadece büyük parseller aramada görünür.
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="Yasakla" name="BanCheck">
-					Her zaman engellenen ([COUNT], maks. [MAX])
+					Engellenen ([COUNT], maks. [MAX])
 				</text>
-				<name_list name="BannedList" tool_tip="([LISTED] listeli, [MAX] maksimum)"/>
+				<name_list name="BannedList" tool_tip="([LISTED] listeli, [MAX] maksimum)">
+					<columns label="Ad" name="name"/>
+					<columns label="Süre" name="duration"/>
+				</name_list>
 				<button label="Ekle" name="add_banned"/>
 				<button label="Kaldır" label_selected="Kaldır" name="remove_banned"/>
 			</panel>
diff --git a/indra/newview/skins/default/xui/tr/floater_ban_duration.xml b/indra/newview/skins/default/xui/tr/floater_ban_duration.xml
new file mode 100644
index 0000000000..22788a161a
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_ban_duration.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="ban_duration" title="Engelleme süresi">
+	<text name="duration_textbox">
+		Engelleme süresi:
+	</text>
+	<radio_group name="ban_duration_radio">
+		<radio_item label="Her zaman" name="always_radio">
+			Her zaman
+		</radio_item>
+		<radio_item label="Geçici" name="temporary_radio">
+			Geçici
+		</radio_item>
+	</radio_group>
+	<text name="hours_textbox">
+		saat
+	</text>
+	<button label="Tamam" name="ok_btn"/>
+	<button label="İptal Et" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_gesture.xml b/indra/newview/skins/default/xui/tr/floater_gesture.xml
index 5f5d28ad6c..c466681fd9 100644
--- a/indra/newview/skins/default/xui/tr/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/tr/floater_gesture.xml
@@ -20,7 +20,7 @@
 		<button name="activate_btn" tool_tip="Seçilen mimiği Etkinleştir/Devre Dışı Bırak"/>
 		<button name="del_btn" tool_tip="Bu mimiği sil"/>
 	</panel>
-	<button label="Düzenle" name="edit_btn"/>
-	<button label="Oyna" name="play_btn"/>
+	<button label="Düzenle" name="edit_btn" tool_tip="Seçilen mimiği düzenlemek için pencere açın."/>
+	<button label="Oyna" name="play_btn" tool_tip="Seçilen mimiği SL dünyasında uygulayın."/>
 	<button label="Durdur" name="stop_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml
index 734ceec89f..01ada1354c 100644
--- a/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml
@@ -43,6 +43,7 @@
 	<check_box label="Anisotropik Filtreleme (etkinken daha yavaş)" name="ani"/>
 	<check_box initial_value="true" label="OpenGL Vertex Tampon Nesnelerini Etkinleştir" name="vbo" tool_tip="Modern donanımlarda bunun etkinleştirilmesi performans artışı sağlar.  Ancak, eski donanımlardaki VBO uygulamaları yetersizdir ve etkinleştirildiğinde bilgisayarınız çökebilir."/>
 	<check_box initial_value="true" label="Doku Sıkıştırmasını Etkinleştir (yeniden başlatma gerektirir)" name="texture compression" tool_tip="Video bellekteki dokuları sıkıştırır, renk kalitesinde bazı kayıplar olmasına karşın daha yüksek çözünürlükte dokuların yüklenmesine imkan tanır."/>
+	<check_box initial_value="true" label="HiDPI görüntü desteğini etkinleştir (yeniden başlatma gerekir)" name="use HiDPI" tool_tip="Yüksek Çözünürlüklü Çizim için OpenGL&apos;yi etkinleştirin."/>
 	<text name="antialiasing label">
 		Antialiasing:
 	</text>
diff --git a/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml b/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml
index 23391249d1..996054a8c6 100644
--- a/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml
@@ -15,6 +15,7 @@
 	<text_editor name="Notecard Editor">
 		Yükleniyor...
 	</text_editor>
+	<button label="Düzenle..." label_selected="Düzenle" name="Edit"/>
 	<button label="Kaydet" label_selected="Kaydet" name="Save"/>
 	<button label="Sil" label_selected="Sil" name="Delete"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_report_abuse.xml b/indra/newview/skins/default/xui/tr/floater_report_abuse.xml
index 28bacca763..de386d3bde 100644
--- a/indra/newview/skins/default/xui/tr/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/tr/floater_report_abuse.xml
@@ -67,7 +67,7 @@
 		<combo_box.item label="Arazi &gt; Tecavüz &gt; Nesneler veya dokular" name="Land__Encroachment__Objects_textures"/>
 		<combo_box.item label="Arazi &gt; Tecavvüz &gt; Parçacıklar" name="Land__Encroachment__Particles"/>
 		<combo_box.item label="Arazi &gt; Tecavvüz &gt; Ağaçlar/bitkiler" name="Land__Encroachment__Trees_plants"/>
-		<combo_box.item label="Oyun Politikası İhlali" name="Wagering_gambling"/>
+		<combo_box.item label="Yetenek Oyunu Politikası İhlali" name="Wagering_gambling"/>
 		<combo_box.item label="Diğer" name="Other"/>
 	</combo_box>
 	<text name="abuser_name_title">
diff --git a/indra/newview/skins/default/xui/tr/panel_group_general.xml b/indra/newview/skins/default/xui/tr/panel_group_general.xml
index 0462026249..c666778c69 100644
--- a/indra/newview/skins/default/xui/tr/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_general.xml
@@ -45,7 +45,7 @@ Daha fazla yardım edinmek için farenizi seçeneklerin üzerine getirin.
 		<check_box label="Herkes katılabilir" name="open_enrollement" tool_tip="Bu grubun davet edilmeden yeni üyelerin katılmasına imkan tanıyıp tanımayacağını belirler."/>
 		<check_box label="Katılma ücreti" name="check_enrollment_fee" tool_tip="Bu gruba katılmak için bir kayıt ücretinin gerekip gerekmeyeceğini belirler"/>
 		<spinner label="L$" name="spin_enrollment_fee" tool_tip="Kayıt Ücreti işaretlendiğinde yeni üyeler gruba katılmak için bu ücreti ödemelidir."/>
-		<combo_box name="group_mature_check" tool_tip="Grubunuzun Orta seviyede içeriğe sahip olup olmadığını belirler">
+		<combo_box name="group_mature_check" tool_tip="Erişkinlik dereceleri bir grupta izin verilen içerik ve davranış türlerini belirler">
 			<combo_item name="select_mature">
 				- Erişkinlik seviyesini seçin -
 			</combo_item>
diff --git a/indra/newview/skins/default/xui/tr/panel_region_access.xml b/indra/newview/skins/default/xui/tr/panel_region_access.xml
index 57e721bc04..81653b1e54 100644
--- a/indra/newview/skins/default/xui/tr/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/tr/panel_region_access.xml
@@ -14,6 +14,7 @@
 		<panel label="İZİN VERİLEN" name="allowed_panel">
 			<panel label="top_panel" name="allowed_search_panel">
 				<filter_editor label="İzin verilen aracıları ara" name="allowed_search_input"/>
+				<button label="Kopyala" name="copy_allowed_list_btn"/>
 			</panel>
 			<text name="allow_resident_label">
 				Her zaman izin verilen:
@@ -27,6 +28,7 @@
 		<panel label="İZİN VERİLEN GRUPLAR" name="allowed_groups_panel">
 			<panel label="top_panel" name="allowed_group_search_panel">
 				<filter_editor label="İzin verilen grupları ara" name="allowed_group_search_input"/>
+				<button label="Kopyala" name="copy_allowed_group_list_btn"/>
 			</panel>
 			<text name="allow_group_label">
 				Her zaman izin verilen gruplar:
@@ -40,6 +42,7 @@
 		<panel label="ENGELLENEN" name="banned_panel">
 			<panel label="top_panel" name="banned_search_panel">
 				<filter_editor label="Engellenen aracıları ara" name="banned_search_input"/>
+				<button label="Kopyala" name="copy_banned_list_btn"/>
 			</panel>
 			<text name="ban_resident_label">
 				Her zaman engellenen:
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index dddf2365ab..27f3c4d4d9 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -76,6 +76,9 @@ Gelişmiş Aydınlatma Modeli: [GPU_SHADERS]
 Doku belleği: [TEXTURE_MEMORY]MB
 VFS (önbellek) oluşturma saati: [VFS_TIME]
 	</string>
+	<string name="AboutOSXHiDPI">
+		HiDPI görüntü modu: [HIDPI]
+	</string>
 	<string name="AboutLibs">
 		J2C Kod Çözücü Sürümü: [J2C_VERSION] 
 Ses Sürücüsü Sürümü: [AUDIO_DRIVER_VERSION] 
@@ -1475,6 +1478,15 @@ http://secondlife.com/support adresini ziyaret edin.
 	<string name="MarketplaceURL_LearnMore">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more
 	</string>
+	<string name="InventoryPlayAnimationTooltip">
+		Pencereyi Oyun seçenekleri ile birlikte açın.
+	</string>
+	<string name="InventoryPlayGestureTooltip">
+		Seçilen mimiği SL dünyasında uygulayın.
+	</string>
+	<string name="InventoryPlaySoundTooltip">
+		Pencereyi Oyun seçenekleri ile birlikte açın.
+	</string>
 	<string name="InventoryOutboxNotMerchantTitle">
 		Pazaryerinde herkes öğe satabilir.
 	</string>
@@ -5406,9 +5418,6 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="Command_Destinations_Label">
 		Hedef Konum
 	</string>
-	<string name="Command_Facebook_Label">
-		Facebook
-	</string>
 	<string name="Command_Flickr_Label">
 		Flickr
 	</string>
@@ -5502,9 +5511,6 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="Command_Destinations_Tooltip">
 		İlgilendiğiniz hedef konumlar
 	</string>
-	<string name="Command_Facebook_Tooltip">
-		Facebook&apos;ta Yayınla
-	</string>
 	<string name="Command_Flickr_Tooltip">
 		Flickr&apos;a yükle
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/floater_about_land.xml b/indra/newview/skins/default/xui/zh/floater_about_land.xml
index badd00bc6d..1164722abf 100644
--- a/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml
@@ -9,6 +9,12 @@
 	<floater.string name="maturity_icon_adult">
 		&quot;Parcel_R_Dark&quot;
 	</floater.string>
+	<floater.string name="Hours">
+		[HOURS]小時
+	</floater.string>
+	<floater.string name="Hour">
+		小時
+	</floater.string>
 	<floater.string name="Minutes">
 		[MINUTES] 分鐘
 	</floater.string>
@@ -21,6 +27,9 @@
 	<floater.string name="Remaining">
 		剩餘時間
 	</floater.string>
+	<floater.string name="Always">
+		永遠
+	</floater.string>
 	<tab_container name="landtab">
 		<panel label="一般" name="land_general_panel">
 			<panel.string name="new users only">
@@ -316,18 +325,18 @@
 			<text name="allow_label2">
 				建造：
 			</text>
-			<check_box label="任何人" name="edit objects check"/>
-			<check_box label="群組" name="edit group objects check"/>
+			<check_box label="任何人" name="edit objects check" tool_tip="如果勾選，居民可在你土地上創建並產生物件。"/>
+			<check_box label="群組" name="edit group objects check" tool_tip="如果勾選，地段群組成員可以在你土地上創建並產生物件。"/>
 			<text name="allow_label3">
 				物件進入：
 			</text>
-			<check_box label="任何人" name="all object entry check"/>
-			<check_box label="群組" name="group object entry check"/>
+			<check_box label="任何人" name="all object entry check" tool_tip="如果勾選，居民可以從別的地段移動物件到本地段。"/>
+			<check_box label="群組" name="group object entry check" tool_tip="如果勾選，地段群組成員可以從別的地段移動物件到本地段。"/>
 			<text name="allow_label4">
 				執行腳本：
 			</text>
-			<check_box label="任何人" name="check other scripts"/>
-			<check_box label="群組" name="check group scripts"/>
+			<check_box label="任何人" name="check other scripts" tool_tip="如果勾選，居民可以在你的地段執行腳本，包括附件。"/>
+			<check_box label="群組" name="check group scripts" tool_tip="如果勾選，地段群組成員可以在你的地段執行腳本，包括附件。"/>
 			<check_box label="安全（無傷害）" name="check safe" tool_tip="若勾選，將把土地設為安全，禁絕傷害性的戰鬥。 若未勾選，則允許傷害性的戰鬥。"/>
 			<check_box label="禁止推撞" name="PushRestrictCheck" tool_tip="禁止使用腳本推撞。 勾選這選項可有效防止你土地上出現滋事行為。"/>
 			<check_box label="將地點刊登顯示在搜尋中（L$30 / 每週）" name="ShowDirectoryCheck" tool_tip="讓其他人可以在搜尋結果中看到這塊地段"/>
@@ -351,7 +360,7 @@
 				快照：
 			</text>
 			<texture_picker name="snapshot_ctrl" tool_tip="點按以挑選圖片"/>
-			<text name="allow_label5">
+			<text name="allow_see_label">
 				其他地段的化身可以看見本地段裡的化身，並與之交談
 			</text>
 			<check_box label="察看化身" name="SeeAvatarsCheck" tool_tip="允許其他地段的化身看到本地段包括你在內的化身，並可互相交談。"/>
@@ -454,9 +463,12 @@
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="禁止" name="BanCheck">
-					永久封鎖（[COUNT]，最多[MAX]）
+					被封鎖（[COUNT]，最多[MAX]）
 				</text>
-				<name_list name="BannedList" tool_tip="（已列入 [LISTED]，最多可列 [MAX]）"/>
+				<name_list name="BannedList" tool_tip="（已列入 [LISTED]，最多可列 [MAX]）">
+					<columns label="名稱" name="name"/>
+					<columns label="歷時" name="duration"/>
+				</name_list>
 				<button label="添加" name="add_banned"/>
 				<button label="移除" label_selected="移除" name="remove_banned"/>
 			</panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_ban_duration.xml b/indra/newview/skins/default/xui/zh/floater_ban_duration.xml
new file mode 100644
index 0000000000..d8a3e8c8a0
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_ban_duration.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="ban_duration" title="封鎖時間長度">
+	<text name="duration_textbox">
+		封鎖時間長度：
+	</text>
+	<radio_group name="ban_duration_radio">
+		<radio_item label="永遠" name="always_radio">
+			永遠
+		</radio_item>
+		<radio_item label="暫時性" name="temporary_radio">
+			暫時性
+		</radio_item>
+	</radio_group>
+	<text name="hours_textbox">
+		小時
+	</text>
+	<button label="確定" name="ok_btn"/>
+	<button label="取消" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_gesture.xml b/indra/newview/skins/default/xui/zh/floater_gesture.xml
index e7b1ed1de3..592b410d1c 100644
--- a/indra/newview/skins/default/xui/zh/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_gesture.xml
@@ -20,7 +20,7 @@
 		<button name="activate_btn" tool_tip="啟動/停止所選姿勢"/>
 		<button name="del_btn" tool_tip="刪除這個姿勢"/>
 	</panel>
-	<button label="編輯" name="edit_btn"/>
-	<button label="播放" name="play_btn"/>
+	<button label="編輯" name="edit_btn" tool_tip="開啓視窗以便編輯所選姿勢。"/>
+	<button label="播放" name="play_btn" tool_tip="在虛擬世界裡執行所選姿勢。"/>
 	<button label="停止" name="stop_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
index 7d8160a0f0..7b127acd71 100644
--- a/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
@@ -43,6 +43,7 @@
 	<check_box label="各向異性過濾（若啟用會變慢）" name="ani"/>
 	<check_box initial_value="true" label="啟用 OpenGL 頂點緩衝物件(VBO)" name="vbo" tool_tip="在較新硬體上啟用，可提升效能。  但是，較舊硬體的 VBO 實作不佳，若啟用可能導致當機。"/>
 	<check_box initial_value="true" label="啟用材質壓縮（須重新啟動）" name="texture compression" tool_tip="在影片記憶體中壓縮材質，讓高解析度材質可以載入，但色彩品質稍差。"/>
+	<check_box initial_value="true" label="啟用HiDPI顯示支援（須重新啟動）" name="use HiDPI" tool_tip="啓用OpenGL高解析度繪圖。"/>
 	<text name="antialiasing label">
 		消除鋸齒：
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
index 9447939801..f6b163dcd6 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
@@ -15,6 +15,7 @@
 	<text_editor name="Notecard Editor">
 		載入中...
 	</text_editor>
+	<button label="編輯…" label_selected="編輯" name="Edit"/>
 	<button label="儲存" label_selected="儲存" name="Save"/>
 	<button label="刪除" label_selected="刪除" name="Delete"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_report_abuse.xml b/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
index 347b40e675..2dfcfe6168 100644
--- a/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
@@ -67,7 +67,7 @@
 		<combo_box.item label="土地 &gt; 侵佔 &gt; 物件或材質" name="Land__Encroachment__Objects_textures"/>
 		<combo_box.item label="土地 &gt; 侵佔 &gt; 粒子" name="Land__Encroachment__Particles"/>
 		<combo_box.item label="土地 &gt; 侵佔 &gt; 樹種 / 植物" name="Land__Encroachment__Trees_plants"/>
-		<combo_box.item label="違反遊戲規則" name="Wagering_gambling"/>
+		<combo_box.item label="違反技術遊戲規則" name="Wagering_gambling"/>
 		<combo_box.item label="其他" name="Other"/>
 	</combo_box>
 	<text name="abuser_name_title">
diff --git a/indra/newview/skins/default/xui/zh/panel_group_general.xml b/indra/newview/skins/default/xui/zh/panel_group_general.xml
index 2b16b61dd1..de81a26fed 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_general.xml
@@ -45,7 +45,7 @@
 		<check_box label="任何人都可以加入" name="open_enrollement" tool_tip="設定這個群組是否允許新成員未受邀請自行加入。"/>
 		<check_box label="加入費用" name="check_enrollment_fee" tool_tip="設定是否要徵收群組加入費"/>
 		<spinner label="L$" name="spin_enrollment_fee" tool_tip="若勾選加入費，新成員必須支付這筆費用才能加入群組。"/>
-		<combo_box name="group_mature_check" tool_tip="設定你的群組是否含有被訂為適度成人分級的資訊">
+		<combo_box name="group_mature_check" tool_tip="內容分級設定群組裡允許的內容類型和行爲">
 			<combo_item name="select_mature">
 				- 選擇內容分級 -
 			</combo_item>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_access.xml b/indra/newview/skins/default/xui/zh/panel_region_access.xml
index 7842d26321..04c67da333 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_access.xml
@@ -14,6 +14,7 @@
 		<panel label="獲准" name="allowed_panel">
 			<panel label="top_panel" name="allowed_search_panel">
 				<filter_editor label="搜尋獲准的用戶" name="allowed_search_input"/>
+				<button label="複製" name="copy_allowed_list_btn"/>
 			</panel>
 			<text name="allow_resident_label">
 				永遠准許：
@@ -27,6 +28,7 @@
 		<panel label="准許的群組" name="allowed_groups_panel">
 			<panel label="top_panel" name="allowed_group_search_panel">
 				<filter_editor label="搜尋獲准的群組" name="allowed_group_search_input"/>
+				<button label="複製" name="copy_allowed_group_list_btn"/>
 			</panel>
 			<text name="allow_group_label">
 				永遠准許的群組：
@@ -40,6 +42,7 @@
 		<panel label="禁入的" name="banned_panel">
 			<panel label="top_panel" name="banned_search_panel">
 				<filter_editor label="搜尋禁入的用戶" name="banned_search_input"/>
+				<button label="複製" name="copy_banned_list_btn"/>
 			</panel>
 			<text name="ban_resident_label">
 				永遠禁入：
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index d14eac88ef..bbbaf57501 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -76,6 +76,9 @@
 材質記憶體：[TEXTURE_MEMORY]MB
 VFS（快取）建立時間：[VFS_TIME]
 	</string>
+	<string name="AboutOSXHiDPI">
+		HiDPI顯示模式：[HIDPI]
+	</string>
 	<string name="AboutLibs">
 		J2C 解碼器版本： [J2C_VERSION]
 音效驅動程式版本： [AUDIO_DRIVER_VERSION]
@@ -1471,6 +1474,15 @@ http://secondlife.com/support 求助解決問題。
 	<string name="MarketplaceURL_LearnMore">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more
 	</string>
+	<string name="InventoryPlayAnimationTooltip">
+		開啟「Play選項」視窗。
+	</string>
+	<string name="InventoryPlayGestureTooltip">
+		在虛擬世界裡執行所選姿勢。
+	</string>
+	<string name="InventoryPlaySoundTooltip">
+		開啟「Play選項」視窗。
+	</string>
 	<string name="InventoryOutboxNotMerchantTitle">
 		任何人都可在第二人生購物市集出售物品。
 	</string>
@@ -5404,9 +5416,6 @@ http://secondlife.com/support 求助解決問題。
 	<string name="Command_Destinations_Label">
 		目的地
 	</string>
-	<string name="Command_Facebook_Label">
-		臉書
-	</string>
 	<string name="Command_Flickr_Label">
 		Flickr
 	</string>
@@ -5500,9 +5509,6 @@ http://secondlife.com/support 求助解決問題。
 	<string name="Command_Destinations_Tooltip">
 		你可能感興趣的目的地
 	</string>
-	<string name="Command_Facebook_Tooltip">
-		發佈到臉書
-	</string>
 	<string name="Command_Flickr_Tooltip">
 		上傳到 Flickr
 	</string>

From 562fe5bf6345fe79f91c657f4d1a30bfc07fbb34 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 27 May 2019 17:32:53 +0300
Subject: [PATCH 02/97] SL-10908 Output class names we are clearing on startup

---
 indra/llcommon/llmortician.cpp | 36 ++++++++++++++++++++++++++++++++++
 indra/llcommon/llmortician.h   |  2 ++
 indra/newview/llstartup.cpp    |  8 ++++++++
 3 files changed, 46 insertions(+)

diff --git a/indra/llcommon/llmortician.cpp b/indra/llcommon/llmortician.cpp
index 287f096eae..93c7d520f2 100644
--- a/indra/llcommon/llmortician.cpp
+++ b/indra/llcommon/llmortician.cpp
@@ -37,6 +37,42 @@ LLMortician::~LLMortician()
 	sGraveyard.remove(this);
 }
 
+U32 LLMortician::logClass(std::stringstream &str)
+{
+    U32 size = sGraveyard.size();
+    str << "Mortician graveyard count: " << size;
+    str << " Zealous: " << (sDestroyImmediate ? "True" : "False");
+    if (size == 0)
+    {
+        return size;
+    }
+    str << " Output:\n";
+    std::list<LLMortician*>::iterator iter = sGraveyard.begin();
+    std::list<LLMortician*>::iterator end = sGraveyard.end();
+    while (iter!=end)
+    {
+        LLMortician* dead = *iter;
+        iter++;
+        // Be as detailed and safe as possible to figure out issues
+        str << "Pointer: " << dead;
+        if (dead)
+        {
+            try
+            {
+                str << " Is dead: " << (dead->isDead() ? "True" : "False");
+                str << " Name: " << typeid(*dead).name();
+            }
+            catch (...)
+            {
+
+            }
+        }
+        str << "\n";
+    }
+    str << "--------------------------------------------";
+    return size;
+}
+
 void LLMortician::updateClass() 
 {
 	while (!sGraveyard.empty()) 
diff --git a/indra/llcommon/llmortician.h b/indra/llcommon/llmortician.h
index 9517e2db5e..41cb49fab1 100644
--- a/indra/llcommon/llmortician.h
+++ b/indra/llcommon/llmortician.h
@@ -34,6 +34,8 @@ class LL_COMMON_API LLMortician
 {
 public:
 	LLMortician() { mIsDead = FALSE; }
+	static U32 graveyardCount() { return sGraveyard.size(); };
+	static U32 logClass(std::stringstream &str);
 	static void updateClass();
 	virtual ~LLMortician();
 	void die();
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 0d99b35aee..9397356d40 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -348,6 +348,14 @@ bool idle_startup()
 	// to work.
 	gIdleCallbacks.callFunctions();
 	gViewerWindow->updateUI();
+
+	// There is a crash on updateClass, this is an attempt to get more information
+	if (LLMortician::graveyardCount())
+	{
+		std::stringstream log_stream;
+		LLMortician::logClass(log_stream);
+		LL_INFOS() << log_stream.str() << LL_ENDL;
+	}
 	LLMortician::updateClass();
 
 	const std::string delims (" ");

From 902bfccd0239b33e28c8c1c45e14d4463bd56701 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 28 May 2019 19:16:34 +0300
Subject: [PATCH 03/97] SL-11231 Unused code and wrong macro

---
 indra/llcommon/llfasttimer.h | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h
index 2024d707da..d463fc9d65 100644
--- a/indra/llcommon/llfasttimer.h
+++ b/indra/llcommon/llfasttimer.h
@@ -199,14 +199,10 @@ private:
 	friend BlockTimer timeThisBlock(BlockTimerStatHandle&); 
 
 	BlockTimer(BlockTimerStatHandle& timer);
-#if !defined(MSC_VER) || MSC_VER < 1700
-	// Visual Studio 2010 has a bug where capturing an object returned by value
-	// into a local reference requires access to the copy constructor at the call site.
-	// This appears to be fixed in 2012.
-public:
-#endif
+
 	// no-copy
-	BlockTimer(const BlockTimer& other) {};
+	BlockTimer(const BlockTimer& other);
+	BlockTimer& operator=(const BlockTimer& other);
 
 private:
 	U64						mStartTime;

From ff2a6f97a2b89ca9b4f4b7e9b4ad19e854db58a8 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 28 May 2019 20:38:37 +0300
Subject: [PATCH 04/97] SL-1105 Pack a name for server to use

---
 indra/newview/llmeshrepository.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 38fd2d777e..31e3d408d7 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -2277,6 +2277,7 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
 			instance_entry["material"] = LL_MCODE_WOOD;
 			instance_entry["physics_shape_type"] = data.mModel[LLModel::LOD_PHYSICS].notNull() ? (U8)(LLViewerObject::PHYSICS_SHAPE_PRIM) : (U8)(LLViewerObject::PHYSICS_SHAPE_CONVEX_HULL);
 			instance_entry["mesh"] = mesh_index[data.mBaseModel];
+			instance_entry["mesh_name"] = instance.mLabel;
 
 			instance_entry["face_list"] = LLSD::emptyArray();
 

From d081df14ef4c19395b6c0f6e826764d91d4e034f Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 29 May 2019 19:28:52 +0300
Subject: [PATCH 05/97] SL-11309 Crash on attempt to costruct singletone

---
 indra/newview/llstartup.cpp      | 2 ++
 indra/newview/lltexturefetch.cpp | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 9397356d40..e9d3cfa993 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -162,6 +162,7 @@
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
 #include "llviewerstats.h"
+#include "llviewerstatsrecorder.h"
 #include "llviewerthrottle.h"
 #include "llviewerwindow.h"
 #include "llvoavatar.h"
@@ -1228,6 +1229,7 @@ bool idle_startup()
 		//
 		// Initialize classes w/graphics stuff.
 		//
+		LLViewerStatsRecorder::instance(); // Since textures work in threads
 		gTextureList.doPrefetchImages();		
 		display_startup();
 
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index f6cb787156..fe058024f6 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -2409,7 +2409,11 @@ S32 LLTextureFetchWorker::callbackHttpGet(LLCore::HttpResponse * response,
 	mLoaded = TRUE;
 	setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
 
-	LLViewerStatsRecorder::instance().log(0.2f);
+	if (LLViewerStatsRecorder::instanceExists())
+	{
+		// Do not create this instance inside thread
+		LLViewerStatsRecorder::instance().log(0.2f);
+	}
 	return data_size ;
 }
 

From c338d337e70fed66661803dc82a9530a95755e34 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 30 May 2019 17:39:53 +0300
Subject: [PATCH 06/97] SL-11230 FIXED Imposter Avatars become Jellies with
 Basic Shaders disabled

---
 indra/newview/llvoavatar.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 20fa327790..91c9a9f86d 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -10257,6 +10257,11 @@ void LLVOAvatar::calcMutedAVColor()
         new_color = LLColor4::grey4;
         change_msg = " blocked: color is grey4";
     }
+    else if (!isTooComplex())
+    {
+        new_color = LLColor4::white;
+        change_msg = " simple imposter ";
+    }
     else if ( mMutedAVColor == LLColor4::white || mMutedAVColor == LLColor4::grey3 || mMutedAVColor == LLColor4::grey4 )
     {
         // select a color based on the first byte of the agents uuid so any muted agent is always the same color

From 0c84313a000ff3589cef92fb8ba151ee14a51f58 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 30 May 2019 18:45:02 +0300
Subject: [PATCH 07/97] SL-11321 Do not crash floater if capability is missing

---
 indra/newview/llfloatermyscripts.cpp | 25 +++++++++++++++++++------
 indra/newview/llfloatermyscripts.h   |  4 +++-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/indra/newview/llfloatermyscripts.cpp b/indra/newview/llfloatermyscripts.cpp
index fa2de21a8f..6f9a6c9066 100644
--- a/indra/newview/llfloatermyscripts.cpp
+++ b/indra/newview/llfloatermyscripts.cpp
@@ -41,6 +41,7 @@ const S32 SIZE_OF_ONE_KB = 1024;
 LLFloaterMyScripts::LLFloaterMyScripts(const LLSD& seed)
 	: LLFloater(seed), 
 	mGotAttachmentMemoryUsed(false),
+	mAttachmentDetailsRequested(false),
 	mAttachmentMemoryMax(0),
 	mAttachmentMemoryUsed(0),
 	mGotAttachmentURLsUsed(false),
@@ -55,12 +56,24 @@ BOOL LLFloaterMyScripts::postBuild()
 
 	std::string msg_waiting = LLTrans::getString("ScriptLimitsRequestWaiting");
 	getChild<LLUICtrl>("loading_text")->setValue(LLSD(msg_waiting));
-	return requestAttachmentDetails();
+	mAttachmentDetailsRequested = requestAttachmentDetails();
+	return TRUE;
 }
 
-BOOL LLFloaterMyScripts::requestAttachmentDetails()
+// virtual
+void LLFloaterMyScripts::onOpen(const LLSD& key)
 {
-	if (!gAgent.getRegion()) return FALSE;
+    if (!mAttachmentDetailsRequested)
+    {
+        mAttachmentDetailsRequested = requestAttachmentDetails();
+    }
+
+    LLFloater::onOpen(key);
+}
+
+bool LLFloaterMyScripts::requestAttachmentDetails()
+{
+	if (!gAgent.getRegion()) return false;
 
 	LLSD body;
 	std::string url = gAgent.getRegion()->getCapability("AttachmentResources");
@@ -68,11 +81,11 @@ BOOL LLFloaterMyScripts::requestAttachmentDetails()
 	{
 		LLCoros::instance().launch("LLFloaterMyScripts::getAttachmentLimitsCoro",
 			boost::bind(&LLFloaterMyScripts::getAttachmentLimitsCoro, this, url));
-		return TRUE;
+		return true;
 	}
 	else
 	{
-		return FALSE;
+		return false;
 	}
 }
 
@@ -284,7 +297,7 @@ void LLFloaterMyScripts::onClickRefresh(void* userdata)
 			btn->setEnabled(false);
 		}
 		instance->clearList();
-		instance->requestAttachmentDetails();
+		instance->mAttachmentDetailsRequested = instance->requestAttachmentDetails();
 	}
 	else
 	{
diff --git a/indra/newview/llfloatermyscripts.h b/indra/newview/llfloatermyscripts.h
index fe33ab90ae..3c053a0223 100644
--- a/indra/newview/llfloatermyscripts.h
+++ b/indra/newview/llfloatermyscripts.h
@@ -36,15 +36,17 @@ public:
 	LLFloaterMyScripts(const LLSD& seed);
 
 	BOOL postBuild();
+	/*virtual*/ void onOpen(const LLSD& key);
 	void setAttachmentDetails(LLSD content);
 	void setAttachmentSummary(LLSD content);
-	BOOL requestAttachmentDetails();
+	bool requestAttachmentDetails();
 	void clearList();
 
 private:
 	void getAttachmentLimitsCoro(std::string url);
 
 	bool mGotAttachmentMemoryUsed;
+	bool mAttachmentDetailsRequested;
 	S32 mAttachmentMemoryMax;
 	S32 mAttachmentMemoryUsed;
 

From 1b793f5c10e9f74d66ccbf0d085e169e61e1a592 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 31 May 2019 17:51:51 +0300
Subject: [PATCH 08/97] SL-11323 Bad merge fix and cleanup

---
 .../newview/installers/windows/lang_en-us.nsi | Bin 11488 -> 11434 bytes
 .../skins/default/xui/en/notifications.xml    |   7 -------
 2 files changed, 7 deletions(-)

diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi
index fd4d340816abc487166547c2ec01d4a9ac58cf88..ea680f08e4252ea5aed981ec13ed961eb9cfc621 100644
GIT binary patch
delta 786
zcmYk4O=}ZT6o${FDM`jLjnmlXtI2elv`LlPLJMl51SMM0g$N?;Ds2-#+8Beekcz7y
zq6?+v?V^YaE8;?m)=oiiAzgGS(jOq2g+D;^1B&O~4lxYebKdiu^WG1pG4+0Gd2l6J
zSJah{r_c-skk{Q%m5R()l?_Ej&T&zyXh#&gj;x(eGx-}1V)T#`J1!rtI8A)(xF+fU
zTBA*8tS6nbN_zq4T=_P=#g-nuA8YQ2tbTVtvZL5|6o33q3~M@G`T}TpN-g$SebG8h
z-S!*AZ|}H0QEE{g^M`xzLz}g`gnrjXv)=g@$$Gu)vD`-Ab`@H5+$ZLK`Ob62#DybY
zS$Xs`lIQh@g6R{eC*nBWU1RmRdrWp}esL$$+VD?{r!b-Uz1GQ|l7g*N2s^#I-1{tW
zolypnpy(CRji14$Bsqk_ey&a;VkYrAeAQ}(&nk>2`ue#Xuqu5SAwNYgvkYM`7Dpyl
z6S=h)+de>P+a!cdHi?)Ac+-5NbgHCM8td^BJYnKP{3&~-6FIA%7;(5HBm?Wtqhlp1
zP?7GFK~;J{cc{dlL34DE%B*L&Qf6Y%P05N>m4D0r&?>TB8eS#0Z(L$#&=OB9ax8N+
z*h9?UvYpEui@cA)j<-3xOUF5{a95FcsPZay6l9JTIG^F!0v1xiUW0puTI5xnY>7t5
fBo)t71N_hpd8q+>8D0}_hW#PUsvRpR4we1^zEAS(

delta 715
zcmZ1#`5<zF8YAyS)n;y91}+8=wq{V6SSUR4kOENn;Y3E>$%TwZS;3N%&6(Umf|8SY
znB^vKVRC?RqM-7He6o`bSOq3eVJ-pbgYryR9zb}T4Or(f!X<1btFb2_@$RvgL5<lj
zs5rTdLk1`}kz*>DG@l&9c?!nj>VsRSJ$VDS$Yd?<7_d1Y-VP+WdCYv17x834<v=_a
z-WhOt%gJJV5Pc`%V%n3__*0<jzwj@Eiq95s2H7pFJV|gLRA|4TEy(kVlVya8phEpZ
zra)C6Ra7Ux5UPNRB?=pYb<PKq_M7uW>_7o9QP^<v9nl;h6BL*U;>V!Mv!z@o=ST>E
zRVYuMCov7qQkq;L`3bHn5-u(^NxB8W*?d5ni4m&mu#6&5qL5E|^FJ9Yn4qPcH&9Se
z$$WBwJjdi&iWLyv<^uT{FeRLd{$N4p$vn~;lV8aNF!F8|RN4!ZKCf&Hlx9>}4Yg*i
ziYrjTM-_c0QKSUKkiwA4kORaelNB{YxziXj!MtJyP?Snfw$kRBJW0J{@-11e$!Z!~
zCI_g>O|H`76D(oK0P4wQuxC&LCq>@LiJHogK$@d@0&b)7<PNPFKvw{b+H9qr$H)S*
F835EFvi1M~

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 053c041849..6e710f053c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1773,13 +1773,6 @@ Visit [_URL] for more information?
   <tag>fail</tag>
   </notification>
 
-  <notification
-   icon="alertmodal.tga"
-   name="RunLauncher"
-   type="alertmodal">
-     Please do not directly run the viewer executable. Update any existing shortcuts to run SL_Launcher instead.
-  </notification>
-
   <notification
    icon="alertmodal.tga"
    name="OldGPUDriver"

From 618446f8df1b664f2ff826d106de5bd65ef09bac Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 31 May 2019 18:10:50 +0300
Subject: [PATCH 09/97] SL-11324 FIXED Accidental deletion of Marketplace
 Listings folder possible

---
 indra/newview/llinventorybridge.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index a50a66a8ce..64bc486767 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2269,7 +2269,7 @@ public:
 // Can be destroyed (or moved to trash)
 BOOL LLFolderBridge::isItemRemovable() const
 {
-	if (!get_is_category_removable(getInventoryModel(), mUUID))
+	if (!get_is_category_removable(getInventoryModel(), mUUID) || isMarketplaceListingsFolder())
 	{
 		return FALSE;
 	}
@@ -2285,11 +2285,6 @@ BOOL LLFolderBridge::isItemRemovable() const
 			return FALSE;
 		}
 	}
-    
-    if (isMarketplaceListingsFolder() && LLMarketplaceData::instance().getActivationState(mUUID))
-    {
-        return FALSE;
-    }
 
 	return TRUE;
 }

From 3dd074d5ec83edbc3af3de0f50f8ca6cdfb7ef29 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 31 May 2019 21:56:58 +0300
Subject: [PATCH 10/97] SL-11338 Better logging for missing texture reference

---
 indra/newview/llviewertexture.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index a81b3aaef9..93562cfab2 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -3680,9 +3680,9 @@ void LLViewerMediaTexture::removeFace(U32 ch, LLFace* facep)
 		}
 	}
 
-	if(te && te->getID().notNull()) //should have a texture
+	if(te && te->getID().notNull()) //should have a texture but none found
 	{
-		LL_ERRS() << "mTextureList texture reference number is corrupted." << LL_ENDL;
+		LL_ERRS() << "mTextureList texture reference number is corrupted. Texture id: " << te->getID() << " List size: " << (U32)mTextureList.size() << LL_ENDL;
 	}
 }
 

From 930bf680c2d184b8678a0c42a8d3a0d30e104643 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 3 Jun 2019 21:37:43 +0300
Subject: [PATCH 11/97] SL-10423 Dump path data when missing critical file

---
 indra/llui/lltransutil.cpp    |  1 +
 indra/llvfs/lldir.cpp         | 32 ++++++++++++++++----------------
 indra/llvfs/lldir.h           |  2 +-
 indra/newview/llappviewer.cpp |  1 +
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/indra/llui/lltransutil.cpp b/indra/llui/lltransutil.cpp
index b1534bb5e4..5da722a72b 100644
--- a/indra/llui/lltransutil.cpp
+++ b/indra/llui/lltransutil.cpp
@@ -44,6 +44,7 @@ bool LLTransUtil::parseStrings(const std::string& xml_filename, const std::set<s
 	bool success = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root, LLDir::ALL_SKINS);
 	if (!success)
 	{
+		gDirUtilp->dumpCurrentDirectories(LLError::LEVEL_WARN);
 		LL_ERRS() << "Couldn't load string table " << xml_filename << ". Please reinstall viewer from  https://secondlife.com/support/downloads/ and contact https://support.secondlife.com if issue persists after reinstall." << LL_ENDL;
 		return false;
 	}
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp
index 18836e54b0..2076ce334e 100644
--- a/indra/llvfs/lldir.cpp
+++ b/indra/llvfs/lldir.cpp
@@ -1033,24 +1033,24 @@ bool LLDir::setCacheDir(const std::string &path)
 	}
 }
 
-void LLDir::dumpCurrentDirectories()
+void LLDir::dumpCurrentDirectories(LLError::ELevel level)
 {
-	LL_DEBUGS("AppInit","Directories") << "Current Directories:" << LL_ENDL;
+	LL_VLOGS(level, "AppInit","Directories") << "Current Directories:" << LL_ENDL;
 
-	LL_DEBUGS("AppInit","Directories") << "  CurPath:               " << getCurPath() << LL_ENDL;
-	LL_DEBUGS("AppInit","Directories") << "  AppName:               " << getAppName() << LL_ENDL;
-	LL_DEBUGS("AppInit","Directories") << "  ExecutableFilename:    " << getExecutableFilename() << LL_ENDL;
-	LL_DEBUGS("AppInit","Directories") << "  ExecutableDir:         " << getExecutableDir() << LL_ENDL;
-	LL_DEBUGS("AppInit","Directories") << "  ExecutablePathAndName: " << getExecutablePathAndName() << LL_ENDL;
-	LL_DEBUGS("AppInit","Directories") << "  WorkingDir:            " << getWorkingDir() << LL_ENDL;
-	LL_DEBUGS("AppInit","Directories") << "  AppRODataDir:          " << getAppRODataDir() << LL_ENDL;
-	LL_DEBUGS("AppInit","Directories") << "  OSUserDir:             " << getOSUserDir() << LL_ENDL;
-	LL_DEBUGS("AppInit","Directories") << "  OSUserAppDir:          " << getOSUserAppDir() << LL_ENDL;
-	LL_DEBUGS("AppInit","Directories") << "  LindenUserDir:         " << getLindenUserDir() << LL_ENDL;
-	LL_DEBUGS("AppInit","Directories") << "  TempDir:               " << getTempDir() << LL_ENDL;
-	LL_DEBUGS("AppInit","Directories") << "  CAFile:				 " << getCAFile() << LL_ENDL;
-	LL_DEBUGS("AppInit","Directories") << "  SkinBaseDir:           " << getSkinBaseDir() << LL_ENDL;
-	LL_DEBUGS("AppInit","Directories") << "  SkinDir:               " << getSkinDir() << LL_ENDL;
+	LL_VLOGS(level, "AppInit", "Directories") << "  CurPath:               " << getCurPath() << LL_ENDL;
+	LL_VLOGS(level, "AppInit", "Directories") << "  AppName:               " << getAppName() << LL_ENDL;
+	LL_VLOGS(level, "AppInit", "Directories") << "  ExecutableFilename:    " << getExecutableFilename() << LL_ENDL;
+	LL_VLOGS(level, "AppInit", "Directories") << "  ExecutableDir:         " << getExecutableDir() << LL_ENDL;
+	LL_VLOGS(level, "AppInit", "Directories") << "  ExecutablePathAndName: " << getExecutablePathAndName() << LL_ENDL;
+	LL_VLOGS(level, "AppInit", "Directories") << "  WorkingDir:            " << getWorkingDir() << LL_ENDL;
+	LL_VLOGS(level, "AppInit", "Directories") << "  AppRODataDir:          " << getAppRODataDir() << LL_ENDL;
+	LL_VLOGS(level, "AppInit", "Directories") << "  OSUserDir:             " << getOSUserDir() << LL_ENDL;
+	LL_VLOGS(level, "AppInit", "Directories") << "  OSUserAppDir:          " << getOSUserAppDir() << LL_ENDL;
+	LL_VLOGS(level, "AppInit", "Directories") << "  LindenUserDir:         " << getLindenUserDir() << LL_ENDL;
+	LL_VLOGS(level, "AppInit", "Directories") << "  TempDir:               " << getTempDir() << LL_ENDL;
+	LL_VLOGS(level, "AppInit", "Directories") << "  CAFile:                " << getCAFile() << LL_ENDL;
+	LL_VLOGS(level, "AppInit", "Directories") << "  SkinBaseDir:           " << getSkinBaseDir() << LL_ENDL;
+	LL_VLOGS(level, "AppInit", "Directories") << "  SkinDir:               " << getSkinDir() << LL_ENDL;
 }
 
 void LLDir::append(std::string& destpath, const std::string& name) const
diff --git a/indra/llvfs/lldir.h b/indra/llvfs/lldir.h
index e233413a7f..38e204ef04 100644
--- a/indra/llvfs/lldir.h
+++ b/indra/llvfs/lldir.h
@@ -194,7 +194,7 @@ class LLDir
 	virtual bool setCacheDir(const std::string &path);
 	virtual void updatePerAccountChatLogsDir();
 
-	virtual void dumpCurrentDirectories();
+	virtual void dumpCurrentDirectories(LLError::ELevel level = LLError::LEVEL_DEBUG);
 
 	// Utility routine
 	std::string buildSLOSCacheDir() const;
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index be5611899a..e201d56815 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2882,6 +2882,7 @@ void LLAppViewer::initStrings()
 	if (strings_path_full.empty() || !LLFile::isfile(strings_path_full))
 	{
 		// initial check to make sure files are there failed
+		gDirUtilp->dumpCurrentDirectories(LLError::LEVEL_WARN);
 		LL_ERRS() << "Viewer failed to find localization and UI files. Please reinstall viewer from  https://secondlife.com/support/downloads/ and contact https://support.secondlife.com if issue persists after reinstall." << LL_ENDL;
 	}
 	LLTransUtil::parseStrings(strings_file, default_trans_args);

From 58946f8be727116a681ffd04ba41c7293f191741 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 5 Jun 2019 14:17:02 +0300
Subject: [PATCH 12/97] SL-4770 FIXED Search no longer activates the search
 field by default

---
 indra/newview/llfloatersearch.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp
index 66e832111b..d1246dae4c 100644
--- a/indra/newview/llfloatersearch.cpp
+++ b/indra/newview/llfloatersearch.cpp
@@ -120,6 +120,7 @@ void LLFloaterSearch::onOpen(const LLSD& key)
 	p.allow_address_entry = false;
 
 	LLFloaterWebContent::onOpen(p);
+	mWebBrowser->setFocus(TRUE);
 	search(p.search);
 }
 

From c4a879f5d4f3736ee096c41f3c26d0a01d2a71c5 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 5 Jun 2019 21:33:23 +0300
Subject: [PATCH 13/97] SL-11362 not all special character work in command line
 parameters

---
 indra/newview/llappviewerwin32.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index fff2653c98..d208e135bb 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -312,12 +312,12 @@ void ll_nvapi_init(NvDRSSessionHandle hSession)
 #if DEBUGGING_SEH_FILTER
 #	define WINMAIN DebuggingWinMain
 #else
-#	define WINMAIN WinMain
+#	define WINMAIN wWinMain
 #endif
 
 int APIENTRY WINMAIN(HINSTANCE hInstance,
                      HINSTANCE hPrevInstance,
-                     LPSTR     lpCmdLine,
+                     PWSTR     pCmdLine,
                      int       nCmdShow)
 {
 	const S32 MAX_HEAPS = 255;
@@ -356,8 +356,8 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
 	// *FIX: global
 	gIconResource = MAKEINTRESOURCE(IDI_LL_ICON);
 
-	LLAppViewerWin32* viewer_app_ptr = new LLAppViewerWin32(lpCmdLine);
-	
+	LLAppViewerWin32* viewer_app_ptr = new LLAppViewerWin32(ll_convert_wide_to_string(pCmdLine).c_str());
+
 	gOldTerminateHandler = std::set_terminate(exceptionTerminateHandler);
 
 	viewer_app_ptr->setErrorHandler(LLAppViewer::handleViewerCrash);
@@ -469,9 +469,9 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
 // in a method that uses object destructors. Go figure.
 // This winmain just calls the real winmain inside __try.
 // The __except calls our exception filter function. For debugging purposes.
-int APIENTRY WinMain(HINSTANCE hInstance,
+int APIENTRY wWinMain(HINSTANCE hInstance,
                      HINSTANCE hPrevInstance,
-                     LPSTR     lpCmdLine,
+                     PWSTR     lpCmdLine,
                      int       nCmdShow)
 {
     __try

From 583558dad8bf03e9d1da997a994d3bc422d1fe11 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 6 Jun 2019 20:05:51 +0300
Subject: [PATCH 14/97] SL-11378 Edit tool floater displays with issues if
 opened mid-drag

---
 indra/newview/llfloatertools.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index c2c15ee12b..0429749e11 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -850,6 +850,18 @@ void LLFloaterTools::onOpen(const LLSD& key)
 	{
 		mTab->selectTabByName(panel);
 	}
+
+	LLTool* tool = LLToolMgr::getInstance()->getCurrentTool();
+	if (tool == LLToolCompInspect::getInstance()
+		|| tool == LLToolDragAndDrop::getInstance())
+	{
+		// Something called floater up while it was supressed (during drag n drop, inspect),
+		// so it won't be getting any layout or visibility updates, update once
+		// further updates will come from updateLayout()
+		LLCoordGL select_center_screen;
+		MASK	mask = gKeyboard->currentMask(TRUE);
+		updatePopup(select_center_screen, mask);
+	}
 	
 	//gMenuBarView->setItemVisible("BuildTools", TRUE);
 }

From 7bce446b28fc7f7f93b2c4927dac2f9da0835264 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Mon, 10 Jun 2019 14:09:31 -0700
Subject: [PATCH 15/97] Changes from @andreyk for improved mouse scroll wheel
 performance and pull in new Dullahan with CEF
 74.1.19_gb62bacf_chromium-74.0.3729.157

---
 autobuild.xml                                | 14 +++++++-------
 indra/llplugin/llpluginclassmedia.cpp        |  4 +++-
 indra/llplugin/llpluginclassmedia.h          |  2 +-
 indra/media_plugins/cef/media_plugin_cef.cpp |  7 +++++--
 indra/newview/llmediactrl.cpp                |  5 ++++-
 indra/newview/llpanelprimmediacontrols.cpp   | 16 ++++++++--------
 indra/newview/llviewermedia.cpp              |  4 ++--
 indra/newview/llviewermedia.h                |  2 +-
 indra/newview/llviewermediafocus.cpp         |  7 +------
 9 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 5f072512c1..88900a4f29 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -580,9 +580,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>23aeaf23e7db2484a1850017141860dd</string>
+              <string>c3c10098d8c9c86bd3392c3441591554</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34069/283470/dullahan-1.1.1320_3.3626.1895.g7001d56-darwin64-525361.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38807/327515/dullahan-1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157-darwin64-527989.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -592,9 +592,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>71fa66203326aca918796e874976c080</string>
+              <string>f8a1da6f464b3a19d2e087525ab97855</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34070/283477/dullahan-1.1.1320_3.3626.1895.g7001d56-windows-525361.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38808/327521/dullahan-1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157-windows-527989.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -604,16 +604,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>c7162e4805f50a3609f5dc63d0cf2bc0</string>
+              <string>bd481e6adfe1280fef7d9f840133421e</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34071/283480/dullahan-1.1.1320_3.3626.1895.g7001d56-windows64-525361.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38809/327525/dullahan-1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157-windows64-527989.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.1.1320_3.3626.1895.g7001d56</string>
+        <string>1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157</string>
       </map>
       <key>elfio</key>
       <map>
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 9d447b0f37..cdf2ddde6c 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -656,12 +656,14 @@ bool LLPluginClassMedia::keyEvent(EKeyEventType type, int key_code, MASK modifie
 	return result;
 }
 
-void LLPluginClassMedia::scrollEvent(int x, int y, MASK modifiers)
+void LLPluginClassMedia::scrollEvent(int x, int y, int clicks_x, int clicks_y, MASK modifiers)
 {
 	LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "scroll_event");
 
 	message.setValueS32("x", x);
 	message.setValueS32("y", y);
+	message.setValueS32("clicks_x", clicks_x);
+	message.setValueS32("clicks_y", clicks_y);
 	message.setValue("modifiers", translateModifiers(modifiers));
 
 	sendMessage(message);
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index 4f52afb317..9d11ee0421 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -118,7 +118,7 @@ public:
 	
 	bool keyEvent(EKeyEventType type, int key_code, MASK modifiers, LLSD native_key_data);
 
-	void scrollEvent(int x, int y, MASK modifiers);
+	void scrollEvent(int x, int y, int clicks_x, int clicks_y, MASK modifiers);
 
 	// enable/disable media plugin debugging messages and info spam
 	void enableMediaPluginDebugging( bool enable );
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index 66b316df90..40b480a84e 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -652,10 +652,13 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
 			{
 				S32 x = message_in.getValueS32("x");
 				S32 y = message_in.getValueS32("y");
+				S32 delta_x = message_in.getValueS32("clicks_x");
+				S32 delta_y = message_in.getValueS32("clicks_y");
 				const int scaling_factor = 40;
-				y *= -scaling_factor;
+				delta_x *= -scaling_factor;
+				delta_y *= -scaling_factor;
 
-				mCEFLib->mouseWheel(x, y);
+				mCEFLib->mouseWheel(x, y, delta_x, delta_y);
 			}
 			else if (message_name == "text_event")
 			{
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 7f6955d08c..1d3a026049 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -202,7 +202,10 @@ BOOL LLMediaCtrl::handleScrollWheel( S32 x, S32 y, S32 clicks )
 {
 	if (LLPanel::handleScrollWheel(x, y, clicks)) return TRUE;
 	if (mMediaSource && mMediaSource->hasMedia())
-		mMediaSource->getMediaPlugin()->scrollEvent(0, clicks, gKeyboard->currentMask(TRUE));
+	{
+		convertInputCoords(x, y);
+		mMediaSource->scrollWheel(x, y, 0, clicks, gKeyboard->currentMask(TRUE));
+	}
 
 	return TRUE;
 }
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp
index 5f413fc3c0..c74c2e0fd8 100644
--- a/indra/newview/llpanelprimmediacontrols.cpp
+++ b/indra/newview/llpanelprimmediacontrols.cpp
@@ -547,17 +547,17 @@ void LLPanelPrimMediaControls::updateShape()
 			switch (mScrollState) 
 			{
 				case SCROLL_UP:
-					media_impl->scrollWheel(0, -1, MASK_NONE);
+					media_impl->scrollWheel(0, 0, 0, -1, MASK_NONE);
 					break;
 				case SCROLL_DOWN:
-					media_impl->scrollWheel(0, 1, MASK_NONE);
+					media_impl->scrollWheel(0, 0, 0, 1, MASK_NONE);
 					break;
 				case SCROLL_LEFT:
-					media_impl->scrollWheel(1, 0, MASK_NONE);
+					media_impl->scrollWheel(0, 0, 1, 0, MASK_NONE);
 					//				media_impl->handleKeyHere(KEY_LEFT, MASK_NONE);
 					break;
 				case SCROLL_RIGHT:
-					media_impl->scrollWheel(-1, 0, MASK_NONE);
+					media_impl->scrollWheel(0, 0, -1, 0, MASK_NONE);
 					//				media_impl->handleKeyHere(KEY_RIGHT, MASK_NONE);
 					break;
 				case SCROLL_NONE:
@@ -1134,7 +1134,7 @@ void LLPanelPrimMediaControls::onScrollUp(void* user_data)
 	
 	if(impl)
 	{
-		impl->scrollWheel(0, -1, MASK_NONE);
+		impl->scrollWheel(0, 0, 0, -1, MASK_NONE);
 	}
 }
 void LLPanelPrimMediaControls::onScrollUpHeld(void* user_data)
@@ -1151,7 +1151,7 @@ void LLPanelPrimMediaControls::onScrollRight(void* user_data)
 
 	if(impl)
 	{
-		impl->scrollWheel(-1, 0, MASK_NONE);
+		impl->scrollWheel(0, 0, -1, 0, MASK_NONE);
 //		impl->handleKeyHere(KEY_RIGHT, MASK_NONE);
 	}
 }
@@ -1170,7 +1170,7 @@ void LLPanelPrimMediaControls::onScrollLeft(void* user_data)
 
 	if(impl)
 	{
-		impl->scrollWheel(1, 0, MASK_NONE);
+		impl->scrollWheel(0, 0, 1, 0, MASK_NONE);
 //		impl->handleKeyHere(KEY_LEFT, MASK_NONE);
 	}
 }
@@ -1189,7 +1189,7 @@ void LLPanelPrimMediaControls::onScrollDown(void* user_data)
 	
 	if(impl)
 	{
-		impl->scrollWheel(0, 1, MASK_NONE);
+		impl->scrollWheel(0, 0, 0, 1, MASK_NONE);
 	}
 }
 void LLPanelPrimMediaControls::onScrollDownHeld(void* user_data)
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index d8745b1eca..faad6bdb82 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -2322,14 +2322,14 @@ void LLViewerMediaImpl::mouseDoubleClick(S32 x, S32 y, MASK mask, S32 button)
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
-void LLViewerMediaImpl::scrollWheel(S32 x, S32 y, MASK mask)
+void LLViewerMediaImpl::scrollWheel(S32 x, S32 y, S32 scroll_x, S32 scroll_y, MASK mask)
 {
 	scaleMouse(&x, &y);
 	mLastMouseX = x;
 	mLastMouseY = y;
 	if (mMediaSource)
 	{
-		mMediaSource->scrollEvent(x, y, mask);
+		mMediaSource->scrollEvent(x, y, scroll_x, scroll_y, mask);
 	}
 }
 
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index e2e758befb..bea024e952 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -230,7 +230,7 @@ public:
 	void mouseMove(const LLVector2& texture_coords, MASK mask);
     void mouseDoubleClick(const LLVector2& texture_coords, MASK mask);
     void mouseDoubleClick(S32 x, S32 y, MASK mask, S32 button = 0);
-	void scrollWheel(S32 x, S32 y, MASK mask);
+	void scrollWheel(S32 x, S32 y, S32 scroll_x, S32 scroll_y, MASK mask);
 	void mouseCapture();
 	
 	void navigateBack();
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp
index 59165c1d71..b86d678196 100644
--- a/indra/newview/llviewermediafocus.cpp
+++ b/indra/newview/llviewermediafocus.cpp
@@ -377,12 +377,7 @@ BOOL LLViewerMediaFocus::handleScrollWheel(S32 x, S32 y, S32 clicks)
 	LLViewerMediaImpl* media_impl = getFocusedMediaImpl();
 	if(media_impl && media_impl->hasMedia())
 	{
-        // the scrollEvent() API's x and y are not the same as handleScrollWheel's x and y.
-        // The latter is the position of the mouse at the time of the event
-        // The former is the 'scroll amount' in x and y, respectively.
-        // All we have for 'scroll amount' here is 'clicks'.
-		// We're also not passed the keyboard modifier mask, but we can get that from gKeyboard.
-		media_impl->getMediaPlugin()->scrollEvent(0, clicks, gKeyboard->currentMask(TRUE));
+		media_impl->scrollWheel(x, y, 0, clicks, gKeyboard->currentMask(TRUE));
 		retval = TRUE;
 	}
 	return retval;

From ffae378ab14f38d9ce26b6c79105244c30b9507a Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 11 Jun 2019 17:38:04 +0300
Subject: [PATCH 16/97] SOCIAL-231 Show tooltips for links and images im media
 browser

---
 indra/llplugin/llpluginclassmedia.cpp        | 4 ++++
 indra/media_plugins/cef/media_plugin_cef.cpp | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index cdf2ddde6c..5df64b8e3b 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -1130,6 +1130,10 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
 			mDebugMessageLevel = message.getValue("message_level");
 			mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_DEBUG_MESSAGE);
 		}
+		else if (message_name == "tooltip_text")
+		{
+			mHoverText = message.getValue("tooltip");
+		}
 		else
 		{
 			LL_WARNS("Plugin") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL;
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index 40b480a84e..e05dd3f793 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -62,6 +62,7 @@ private:
 	void onConsoleMessageCallback(std::string message, std::string source, int line);
 	void onStatusMessageCallback(std::string value);
 	void onTitleChangeCallback(std::string title);
+	void onTooltipCallback(std::string text);
 	void onLoadStartCallback();
 	void onRequestExitCallback();
 	void onLoadEndCallback(int httpStatusCode);
@@ -208,6 +209,12 @@ void MediaPluginCEF::onTitleChangeCallback(std::string title)
 	sendMessage(message);
 }
 
+void MediaPluginCEF::onTooltipCallback(std::string text)
+{
+    LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "tooltip_text");
+    message.setValue("tooltip", text);
+    sendMessage(message);
+}
 ////////////////////////////////////////////////////////////////////////////////
 //
 void MediaPluginCEF::onLoadStartCallback()
@@ -486,6 +493,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
 				mCEFLib->setOnConsoleMessageCallback(std::bind(&MediaPluginCEF::onConsoleMessageCallback, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
 				mCEFLib->setOnStatusMessageCallback(std::bind(&MediaPluginCEF::onStatusMessageCallback, this, std::placeholders::_1));
 				mCEFLib->setOnTitleChangeCallback(std::bind(&MediaPluginCEF::onTitleChangeCallback, this, std::placeholders::_1));
+				mCEFLib->setOnTooltipCallback(std::bind(&MediaPluginCEF::onTooltipCallback, this, std::placeholders::_1));
 				mCEFLib->setOnLoadStartCallback(std::bind(&MediaPluginCEF::onLoadStartCallback, this));
 				mCEFLib->setOnLoadEndCallback(std::bind(&MediaPluginCEF::onLoadEndCallback, this, std::placeholders::_1));
 				mCEFLib->setOnLoadErrorCallback(std::bind(&MediaPluginCEF::onLoadError, this, std::placeholders::_1, std::placeholders::_2));

From 36ad4c07091bf68d63d8e02ccfe53deb67bd79b7 Mon Sep 17 00:00:00 2001
From: callum_linden <callum@lindenlab.com>
Date: Tue, 11 Jun 2019 11:26:04 -0700
Subject: [PATCH 17/97] add new version of Dullahan (1.1.2222) to support tool
 tips feature added my @Maxim

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 88900a4f29..e61c62f8dc 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -580,9 +580,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>c3c10098d8c9c86bd3392c3441591554</string>
+              <string>d7b0c8910632f50ae8d21c5d68cdaca8</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38807/327515/dullahan-1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157-darwin64-527989.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38862/328055/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-darwin64-528032.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -592,9 +592,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>f8a1da6f464b3a19d2e087525ab97855</string>
+              <string>9237b8e73999b539a9b2466941d02b79</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38808/327521/dullahan-1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157-windows-527989.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38863/328061/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-windows-528032.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -604,16 +604,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>bd481e6adfe1280fef7d9f840133421e</string>
+              <string>3aef2dad2664a535d561ab4b235944db</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38809/327525/dullahan-1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157-windows64-527989.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38864/328065/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-windows64-528032.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157</string>
+        <string>1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157</string>
       </map>
       <key>elfio</key>
       <map>

From d278699b7b358a744cd33ff4b7bec700e10b3e6a Mon Sep 17 00:00:00 2001
From: callum_linden <callum@lindenlab.com>
Date: Tue, 11 Jun 2019 20:28:54 -0700
Subject: [PATCH 18/97] Pull in CEF 75.0.1+gb5e74dd+chromium-75.0.3770.80 and
 Dullahan 1.2.x along with some minor compatibility changes

---
 autobuild.xml                                | 14 +++++++-------
 indra/llplugin/llpluginclassmedia.cpp        |  2 --
 indra/llplugin/llpluginclassmedia.h          |  2 +-
 indra/media_plugins/cef/media_plugin_cef.cpp |  4 ----
 indra/newview/llviewermedia.cpp              | 11 +++++------
 5 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index e61c62f8dc..517b3d3d4e 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -580,9 +580,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>d7b0c8910632f50ae8d21c5d68cdaca8</string>
+              <string>11362c72e1edae9c98e6cc40d378fd37</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38862/328055/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-darwin64-528032.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38952/328700/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-darwin64-528086.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -592,9 +592,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>9237b8e73999b539a9b2466941d02b79</string>
+              <string>0980cd50e5fed4e68ee78132e5c2e240</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38863/328061/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-windows-528032.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38954/328712/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows-528086.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -604,16 +604,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>3aef2dad2664a535d561ab4b235944db</string>
+              <string>dd072189ea40ed9fa0af0f2caef866ca</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38864/328065/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-windows64-528032.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38953/328705/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows64-528086.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157</string>
+        <string>1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80</string>
       </map>
       <key>elfio</key>
       <map>
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 5df64b8e3b..a4ce8d1382 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -849,12 +849,10 @@ void LLPluginClassMedia::paste()
 }
 
 void LLPluginClassMedia::setUserDataPath(const std::string &user_data_path_cache,
-										 const std::string &user_data_path_cookies,
 										 const std::string &user_data_path_cef_log)
 {
 	LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "set_user_data_path");
 	message.setValue("cache_path", user_data_path_cache);
-	message.setValue("cookies_path", user_data_path_cookies);
 	message.setValue("cef_log_file", user_data_path_cef_log);
 
 	bool cef_verbose_log = gSavedSettings.getBOOL("CefVerboseLog");
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index 9d11ee0421..6f2b875116 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -195,7 +195,7 @@ public:
 	bool	canPaste() const { return mCanPaste; };
 	
 	// These can be called before init(), and they will be queued and sent before the media init message.
-	void	setUserDataPath(const std::string &user_data_path_cache, const std::string &user_data_path_cookies, const std::string &user_data_path_cef_log);
+	void	setUserDataPath(const std::string &user_data_path_cache, const std::string &user_data_path_cef_log);
 	void	setLanguageCode(const std::string &language_code);
 	void	setPluginsEnabled(const bool enabled);
 	void	setJavascriptEnabled(const bool enabled);
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index e05dd3f793..6f0ae0b83b 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -96,7 +96,6 @@ private:
 	bool mCanCopy;
 	bool mCanPaste;
 	std::string mCachePath;
-	std::string mCookiePath;
 	std::string mCefLogFile;
 	bool mCefLogVerbose;
 	std::vector<std::string> mPickedFiles;
@@ -128,7 +127,6 @@ MediaPluginBase(host_send_func, host_user_data)
 	mCanCopy = false;
 	mCanPaste = false;
 	mCachePath = "";
-	mCookiePath = "";
 	mCefLogFile = "";
 	mCefLogVerbose = false;
 	mPickedFiles.clear();
@@ -509,7 +507,6 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
 				settings.background_color = 0xff282828;
 				settings.cache_enabled = true;
 				settings.cache_path = mCachePath;
-				settings.cookie_store_path = mCookiePath;
 				settings.cookies_enabled = mCookiesEnabled;
 				settings.disable_gpu = mDisableGPU;
 				settings.flash_enabled = mPluginsEnabled;
@@ -559,7 +556,6 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
 				std::string user_data_path_cookies = message_in.getValue("cookies_path");
 
 				mCachePath = user_data_path_cache + "cef_cache";
-				mCookiePath = user_data_path_cookies + "cef_cookies";
 				mCefLogFile = message_in.getValue("cef_log_file");
 				mCefLogVerbose = message_in.getValueBoolean("cef_verbose_log");
 			}
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index faad6bdb82..8680cd3f7d 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1731,12 +1731,10 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
 		std::string launcher_name = gDirUtilp->getLLPluginLauncher();
 		std::string plugin_name = gDirUtilp->getLLPluginFilename(plugin_basename);
 
+		// cookies now are stored in the CEF cache directory too (no more control over their location)
 		std::string user_data_path_cache = gDirUtilp->getCacheDir(false);
 		user_data_path_cache += gDirUtilp->getDirDelimiter();
 
-		std::string user_data_path_cookies = gDirUtilp->getOSUserAppDir();
-		user_data_path_cookies += gDirUtilp->getDirDelimiter();
-
 		std::string user_data_path_cef_log = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "cef_log.txt");
 
 		// Fix for EXT-5960 - make browser profile specific to user (cache, cookies etc.)
@@ -1747,8 +1745,9 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
 		std::string linden_user_dir = gDirUtilp->getLindenUserDir();
 		if ( ! linden_user_dir.empty() )
 		{
-			user_data_path_cookies = linden_user_dir;
-			user_data_path_cookies += gDirUtilp->getDirDelimiter();
+			// cookies now are stored in the CEF cache directory too (no more control over their location)
+			user_data_path_cache = linden_user_dir;
+			user_data_path_cache += gDirUtilp->getDirDelimiter();
 		};
 
 		// See if the plugin executable exists
@@ -1767,7 +1766,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
 		{
 			media_source = new LLPluginClassMedia(owner);
 			media_source->setSize(default_width, default_height);
-			media_source->setUserDataPath(user_data_path_cache, user_data_path_cookies, user_data_path_cef_log);
+			media_source->setUserDataPath(user_data_path_cache, user_data_path_cef_log);
 			media_source->setLanguageCode(LLUI::getLanguage());
 			media_source->setZoomFactor(zoom_factor);
 

From 19221d9ccf38a5b10e7e2ecefb1ad121f1fb51d7 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 12 Jun 2019 16:17:37 +0300
Subject: [PATCH 19/97] SL-11402 Save last session image per grid

---
 indra/newview/llappviewer.cpp     |  2 +-
 indra/newview/llstartup.cpp       | 36 +++++++++++++++++++++++++++----
 indra/newview/llstartup.h         |  6 ++----
 indra/newview/llviewerdisplay.cpp |  2 +-
 indra/newview/llviewermessage.cpp |  4 ++--
 5 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index e201d56815..24886b01fb 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -4505,7 +4505,7 @@ void LLAppViewer::saveFinalSnapshot()
 
 		std::string snap_filename = gDirUtilp->getLindenUserDir();
 		snap_filename += gDirUtilp->getDirDelimiter();
-		snap_filename += SCREEN_LAST_FILENAME;
+		snap_filename += LLStartUp::getScreenLastFilename();
 		// use full pixel dimensions of viewer window (not post-scale dimensions)
 		gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw(), FALSE, TRUE);
 		mSavedFinalSnapshot = TRUE;
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index e9d3cfa993..e34a9beb49 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -210,8 +210,8 @@
 bool gAgentMovementCompleted = false;
 S32  gMaxAgentGroups;
 
-std::string SCREEN_HOME_FILENAME = "screen_home.bmp";
-std::string SCREEN_LAST_FILENAME = "screen_last.bmp";
+const std::string SCREEN_HOME_FILENAME = "screen_home%s.bmp";
+const std::string SCREEN_LAST_FILENAME = "screen_last%s.bmp";
 
 LLPointer<LLViewerTexture> gStartTexture;
 
@@ -2577,6 +2577,34 @@ bool callback_choose_gender(const LLSD& notification, const LLSD& response)
 	return false;
 }
 
+std::string get_screen_filename(const std::string& pattern)
+{
+    if (LLGridManager::getInstance()->isInProductionGrid())
+    {
+        return llformat(pattern.c_str(), "");
+    }
+    else
+    {
+        const std::string& grid_id_str = LLGridManager::getInstance()->getGridId();
+        const std::string& grid_id_lower = utf8str_tolower(grid_id_str);
+        std::string grid = "." + grid_id_lower;
+        return llformat(pattern.c_str(), grid.c_str());
+    }
+}
+
+//static
+std::string LLStartUp::getScreenLastFilename()
+{
+    return get_screen_filename(SCREEN_LAST_FILENAME);
+}
+
+//static
+std::string LLStartUp::getScreenHomeFilename()
+{
+    return get_screen_filename(SCREEN_HOME_FILENAME);
+}
+
+//static
 void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name,
 								   const std::string& gender_name )
 {
@@ -2674,11 +2702,11 @@ void init_start_screen(S32 location_id)
 
 	if ((S32)START_LOCATION_ID_LAST == location_id)
 	{
-		temp_str += SCREEN_LAST_FILENAME;
+		temp_str += LLStartUp::getScreenLastFilename();
 	}
 	else
 	{
-		temp_str += SCREEN_HOME_FILENAME;
+		temp_str += LLStartUp::getScreenHomeFilename();
 	}
 
 	LLPointer<LLImageBMP> start_image_bmp = new LLImageBMP;
diff --git a/indra/newview/llstartup.h b/indra/newview/llstartup.h
index d434e86f82..db37207022 100644
--- a/indra/newview/llstartup.h
+++ b/indra/newview/llstartup.h
@@ -41,10 +41,6 @@ bool idle_startup();
 void release_start_screen();
 bool login_alert_done(const LLSD& notification, const LLSD& response);
 
-// constants, variables,  & enumerations
-extern std::string SCREEN_HOME_FILENAME;
-extern std::string SCREEN_LAST_FILENAME;
-
 // start location constants
 enum EStartLocation
 {
@@ -95,6 +91,8 @@ public:
 	static void setStartupState( EStartupState state );
 	static EStartupState getStartupState() { return gStartupState; };
 	static std::string getStartupStateString() { return startupStateToString(gStartupState); };
+	static std::string getScreenLastFilename(); // screenshot taken on exit
+	static std::string getScreenHomeFilename(); // screenshot taken on setting Home
 
 	static void multimediaInit();
 		// Initialize LLViewerMedia multimedia engine.
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index e2554bc9bc..fd49d3b3d3 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -1588,7 +1588,7 @@ void render_disconnected_background()
 		LL_INFOS() << "Loading last bitmap..." << LL_ENDL;
 
 		std::string temp_str;
-		temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter() + SCREEN_LAST_FILENAME;
+		temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter() + LLStartUp::getScreenLastFilename();
 
 		LLPointer<LLImageBMP> image_bmp = new LLImageBMP;
 		if( !image_bmp->load(temp_str) )
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index c8f75c79c4..b70b077618 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5107,7 +5107,7 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
 			// save the home location image to disk
 			std::string snap_filename = gDirUtilp->getLindenUserDir();
 			snap_filename += gDirUtilp->getDirDelimiter();
-			snap_filename += SCREEN_HOME_FILENAME;
+			snap_filename += LLStartUp::getScreenHomeFilename();
 			gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw(), FALSE, FALSE);
 		}
 		
@@ -5190,7 +5190,7 @@ static void process_special_alert_messages(const std::string & message)
 		// save the home location image to disk
 		std::string snap_filename = gDirUtilp->getLindenUserDir();
 		snap_filename += gDirUtilp->getDirDelimiter();
-		snap_filename += SCREEN_HOME_FILENAME;
+		snap_filename += LLStartUp::getScreenHomeFilename();
 		gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw(), FALSE, FALSE);
 	}
 }

From 04e67fa12d1dac368e2f88a04af4cd266b8b2063 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 12 Jun 2019 19:12:09 +0300
Subject: [PATCH 20/97] SL-11402 Last session image should be saved as png

---
 indra/newview/llappviewer.cpp     |  2 +-
 indra/newview/llstartup.cpp       | 16 ++++-----
 indra/newview/llviewerdisplay.cpp | 10 +++---
 indra/newview/llviewermessage.cpp |  4 +--
 indra/newview/llviewerwindow.cpp  | 60 +++++++++++++++++++------------
 indra/newview/llviewerwindow.h    |  2 +-
 6 files changed, 54 insertions(+), 40 deletions(-)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 24886b01fb..f3915b9210 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -4507,7 +4507,7 @@ void LLAppViewer::saveFinalSnapshot()
 		snap_filename += gDirUtilp->getDirDelimiter();
 		snap_filename += LLStartUp::getScreenLastFilename();
 		// use full pixel dimensions of viewer window (not post-scale dimensions)
-		gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw(), FALSE, TRUE);
+		gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw(), FALSE, TRUE, LLSnapshotModel::SNAPSHOT_TYPE_COLOR, LLSnapshotModel::SNAPSHOT_FORMAT_PNG);
 		mSavedFinalSnapshot = TRUE;
 	}
 }
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index e34a9beb49..256ece594c 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -113,7 +113,7 @@
 #include "llgroupmgr.h"
 #include "llhudeffecttrail.h"
 #include "llhudmanager.h"
-#include "llimagebmp.h"
+#include "llimagepng.h"
 #include "llinventorybridge.h"
 #include "llinventorymodel.h"
 #include "llinventorymodelbackgroundfetch.h"
@@ -210,8 +210,8 @@
 bool gAgentMovementCompleted = false;
 S32  gMaxAgentGroups;
 
-const std::string SCREEN_HOME_FILENAME = "screen_home%s.bmp";
-const std::string SCREEN_LAST_FILENAME = "screen_last%s.bmp";
+const std::string SCREEN_HOME_FILENAME = "screen_home%s.png";
+const std::string SCREEN_LAST_FILENAME = "screen_last%s.png";
 
 LLPointer<LLViewerTexture> gStartTexture;
 
@@ -2709,7 +2709,7 @@ void init_start_screen(S32 location_id)
 		temp_str += LLStartUp::getScreenHomeFilename();
 	}
 
-	LLPointer<LLImageBMP> start_image_bmp = new LLImageBMP;
+	LLPointer<LLImagePNG> start_image_png = new LLImagePNG;
 	
 	// Turn off start screen to get around the occasional readback 
 	// driver bug
@@ -2718,18 +2718,18 @@ void init_start_screen(S32 location_id)
 		LL_INFOS("AppInit")  << "Bitmap load disabled" << LL_ENDL;
 		return;
 	}
-	else if(!start_image_bmp->load(temp_str) )
+	else if(!start_image_png->load(temp_str) )
 	{
 		LL_WARNS("AppInit") << "Bitmap load failed" << LL_ENDL;
 		gStartTexture = NULL;
 	}
 	else
 	{
-		gStartImageWidth = start_image_bmp->getWidth();
-		gStartImageHeight = start_image_bmp->getHeight();
+		gStartImageWidth = start_image_png->getWidth();
+		gStartImageHeight = start_image_png->getHeight();
 
 		LLPointer<LLImageRaw> raw = new LLImageRaw;
-		if (!start_image_bmp->decode(raw, 0.0f))
+		if (!start_image_png->decode(raw, 0.0f))
 		{
 			LL_WARNS("AppInit") << "Bitmap decode failed" << LL_ENDL;
 			gStartTexture = NULL;
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index fd49d3b3d3..5924dbc260 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -42,7 +42,7 @@
 #include "llfeaturemanager.h"
 //#include "llfirstuse.h"
 #include "llhudmanager.h"
-#include "llimagebmp.h"
+#include "llimagepng.h"
 #include "llmemory.h"
 #include "llselectmgr.h"
 #include "llsky.h"
@@ -1590,15 +1590,15 @@ void render_disconnected_background()
 		std::string temp_str;
 		temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter() + LLStartUp::getScreenLastFilename();
 
-		LLPointer<LLImageBMP> image_bmp = new LLImageBMP;
-		if( !image_bmp->load(temp_str) )
+		LLPointer<LLImagePNG> image_png = new LLImagePNG;
+		if( !image_png->load(temp_str) )
 		{
 			//LL_INFOS() << "Bitmap load failed" << LL_ENDL;
 			return;
 		}
 		
 		LLPointer<LLImageRaw> raw = new LLImageRaw;
-		if (!image_bmp->decode(raw, 0.0f))
+		if (!image_png->decode(raw, 0.0f))
 		{
 			LL_INFOS() << "Bitmap decode failed" << LL_ENDL;
 			gDisconnectedImagep = NULL;
@@ -1606,7 +1606,7 @@ void render_disconnected_background()
 		}
 
 		U8 *rawp = raw->getData();
-		S32 npixels = (S32)image_bmp->getWidth()*(S32)image_bmp->getHeight();
+		S32 npixels = (S32)image_png->getWidth()*(S32)image_png->getHeight();
 		for (S32 i = 0; i < npixels; i++)
 		{
 			S32 sum = 0;
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index b70b077618..6e5c77e4a9 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5108,7 +5108,7 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
 			std::string snap_filename = gDirUtilp->getLindenUserDir();
 			snap_filename += gDirUtilp->getDirDelimiter();
 			snap_filename += LLStartUp::getScreenHomeFilename();
-			gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw(), FALSE, FALSE);
+			gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw(), FALSE, FALSE, LLSnapshotModel::SNAPSHOT_TYPE_COLOR, LLSnapshotModel::SNAPSHOT_FORMAT_PNG);
 		}
 		
 		if (notificationID == "RegionRestartMinutes" ||
@@ -5191,7 +5191,7 @@ static void process_special_alert_messages(const std::string & message)
 		std::string snap_filename = gDirUtilp->getLindenUserDir();
 		snap_filename += gDirUtilp->getDirDelimiter();
 		snap_filename += LLStartUp::getScreenHomeFilename();
-		gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw(), FALSE, FALSE);
+		gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw(), FALSE, FALSE, LLSnapshotModel::SNAPSHOT_TYPE_COLOR, LLSnapshotModel::SNAPSHOT_FORMAT_PNG);
 	}
 }
 
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 8e6df22171..74770dc483 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -122,7 +122,7 @@
 #include "llhudmanager.h"
 #include "llhudobject.h"
 #include "llhudview.h"
-#include "llimagebmp.h"
+#include "llimage.h"
 #include "llimagej2c.h"
 #include "llimageworker.h"
 #include "llkeyboard.h"
@@ -4487,32 +4487,46 @@ void LLViewerWindow::movieSize(S32 new_width, S32 new_height)
 	}
 }
 
-BOOL LLViewerWindow::saveSnapshot(const std::string& filepath, S32 image_width, S32 image_height, BOOL show_ui, BOOL do_rebuild, LLSnapshotModel::ESnapshotLayerType type)
+BOOL LLViewerWindow::saveSnapshot(const std::string& filepath, S32 image_width, S32 image_height, BOOL show_ui, BOOL do_rebuild, LLSnapshotModel::ESnapshotLayerType type, LLSnapshotModel::ESnapshotFormat format)
 {
-	LL_INFOS() << "Saving snapshot to: " << filepath << LL_ENDL;
+    LL_INFOS() << "Saving snapshot to: " << filepath << LL_ENDL;
 
-	LLPointer<LLImageRaw> raw = new LLImageRaw;
-	BOOL success = rawSnapshot(raw, image_width, image_height, TRUE, FALSE, show_ui, do_rebuild);
+    LLPointer<LLImageRaw> raw = new LLImageRaw;
+    BOOL success = rawSnapshot(raw, image_width, image_height, TRUE, FALSE, show_ui, do_rebuild);
 
-	if (success)
-	{
-		LLPointer<LLImageBMP> bmp_image = new LLImageBMP;
-		success = bmp_image->encode(raw, 0.0f);
-		if( success )
-		{
-			success = bmp_image->save(filepath);
-		}
-		else
-		{
-			LL_WARNS() << "Unable to encode bmp snapshot" << LL_ENDL;
-		}
-	}
-	else
-	{
-		LL_WARNS() << "Unable to capture raw snapshot" << LL_ENDL;
-	}
+    if (success)
+    {
+        U8 image_codec = IMG_CODEC_BMP;
+        switch (format)
+        {
+        case LLSnapshotModel::SNAPSHOT_FORMAT_PNG:
+            image_codec = IMG_CODEC_PNG;
+            break;
+        case LLSnapshotModel::SNAPSHOT_FORMAT_JPEG:
+            image_codec = IMG_CODEC_JPEG;
+            break;
+        default:
+            image_codec = IMG_CODEC_BMP;
+            break;
+        }
 
-	return success;
+        LLPointer<LLImageFormatted> formated_image = LLImageFormatted::createFromType(image_codec);
+        success = formated_image->encode(raw, 0.0f);
+        if (success)
+        {
+            success = formated_image->save(filepath);
+        }
+        else
+        {
+            LL_WARNS() << "Unable to encode snapshot of format " << format << LL_ENDL;
+        }
+    }
+    else
+    {
+        LL_WARNS() << "Unable to capture raw snapshot" << LL_ENDL;
+    }
+
+    return success;
 }
 
 
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index d41a606f11..071a3632dd 100644
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -347,7 +347,7 @@ public:
 	// snapshot functionality.
 	// perhaps some of this should move to llfloatershapshot?  -MG
 
-	BOOL			saveSnapshot(const std::string&  filename, S32 image_width, S32 image_height, BOOL show_ui = TRUE, BOOL do_rebuild = FALSE, LLSnapshotModel::ESnapshotLayerType type = LLSnapshotModel::SNAPSHOT_TYPE_COLOR);
+	BOOL			saveSnapshot(const std::string&  filename, S32 image_width, S32 image_height, BOOL show_ui = TRUE, BOOL do_rebuild = FALSE, LLSnapshotModel::ESnapshotLayerType type = LLSnapshotModel::SNAPSHOT_TYPE_COLOR, LLSnapshotModel::ESnapshotFormat format = LLSnapshotModel::SNAPSHOT_FORMAT_BMP);
 	BOOL			rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_height, BOOL keep_window_aspect = TRUE, BOOL is_texture = FALSE,
 		BOOL show_ui = TRUE, BOOL do_rebuild = FALSE, LLSnapshotModel::ESnapshotLayerType type = LLSnapshotModel::SNAPSHOT_TYPE_COLOR, S32 max_size = MAX_SNAPSHOT_IMAGE_SIZE);
 	BOOL			thumbnailSnapshot(LLImageRaw *raw, S32 preview_width, S32 preview_height, BOOL show_ui, BOOL do_rebuild, LLSnapshotModel::ESnapshotLayerType type);

From ec4ca1717badf53adc968db5930da1329e6979bf Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 12 Jun 2019 19:39:11 +0300
Subject: [PATCH 21/97] SL-11402 Floater reporter images should be saved as png

---
 indra/newview/llfloaterreporter.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index d94bf3f651..960fd9620d 100644
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -38,7 +38,7 @@
 #include "llcallbacklist.h"
 #include "llcheckboxctrl.h"
 #include "llfontgl.h"
-#include "llimagebmp.h"
+#include "llimagepng.h"
 #include "llimagej2c.h"
 #include "llinventory.h"
 #include "llnotificationsutil.h"
@@ -89,7 +89,7 @@
 #include "llcorehttputil.h"
 #include "llviewerassetupload.h"
 
-const std::string SCREEN_PREV_FILENAME = "screen_report_last.bmp";
+const std::string SCREEN_PREV_FILENAME = "screen_report_last.png";
 
 //=========================================================================
 //-----------------------------------------------------------------------------
@@ -872,10 +872,10 @@ void LLFloaterReporter::takeScreenshot(bool use_prev_screenshot)
 	if(!use_prev_screenshot)
 	{
 		std::string screenshot_filename(gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter() + SCREEN_PREV_FILENAME);
-		LLPointer<LLImageBMP> bmp_image = new LLImageBMP;
-		if(bmp_image->encode(mImageRaw, 0.0f))
+		LLPointer<LLImagePNG> png_image = new LLImagePNG;
+		if(png_image->encode(mImageRaw, 0.0f))
 		{
-			bmp_image->save(screenshot_filename);
+			png_image->save(screenshot_filename);
 		}
 	}
 	else
@@ -948,10 +948,10 @@ void LLFloaterReporter::takeNewSnapshot()
 	{
 		std::string screenshot_filename(gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter() + SCREEN_PREV_FILENAME);
 		mPrevImageRaw = new LLImageRaw;
-		LLPointer<LLImageBMP> start_image_bmp = new LLImageBMP;
-		if(start_image_bmp->load(screenshot_filename))
+		LLPointer<LLImagePNG> start_image_png = new LLImagePNG;
+		if(start_image_png->load(screenshot_filename))
 		{
-			if (start_image_bmp->decode(mPrevImageRaw, 0.0f))
+			if (start_image_png->decode(mPrevImageRaw, 0.0f))
 			{
 				LLNotificationsUtil::add("LoadPreviousReportScreenshot", LLSD(), LLSD(), boost::bind(&LLFloaterReporter::onLoadScreenshotDialog,this, _1, _2));
 				return;

From 31a22910c1df637970b66e91b0fd1dc5975aa33c Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 13 Jun 2019 17:35:15 +0300
Subject: [PATCH 22/97] SL-11402 Fallback for home image

---
 indra/newview/llstartup.cpp | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 256ece594c..6e0a36be49 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -113,7 +113,7 @@
 #include "llgroupmgr.h"
 #include "llhudeffecttrail.h"
 #include "llhudmanager.h"
-#include "llimagepng.h"
+#include "llimage.h"
 #include "llinventorybridge.h"
 #include "llinventorymodel.h"
 #include "llinventorymodelbackgroundfetch.h"
@@ -2698,6 +2698,7 @@ void init_start_screen(S32 location_id)
 
 	LL_DEBUGS("AppInit") << "Loading startup bitmap..." << LL_ENDL;
 
+	U8 image_codec = IMG_CODEC_PNG;
 	std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
 
 	if ((S32)START_LOCATION_ID_LAST == location_id)
@@ -2706,11 +2707,23 @@ void init_start_screen(S32 location_id)
 	}
 	else
 	{
-		temp_str += LLStartUp::getScreenHomeFilename();
+		std::string path = temp_str + LLStartUp::getScreenHomeFilename();
+		
+		if (!gDirUtilp->fileExists(path) && LLGridManager::getInstance()->isInProductionGrid())
+		{
+			// Fallback to old file, can be removed later
+			// Home image only sets when user changes home, so it will take time for users to switch to pngs
+			temp_str += "screen_home.bmp";
+			image_codec = IMG_CODEC_BMP;
+		}
+		else
+		{
+			temp_str = path;
+		}
 	}
 
-	LLPointer<LLImagePNG> start_image_png = new LLImagePNG;
-	
+	LLPointer<LLImageFormatted> start_image_frmted = LLImageFormatted::createFromType(image_codec);
+
 	// Turn off start screen to get around the occasional readback 
 	// driver bug
 	if(!gSavedSettings.getBOOL("UseStartScreen"))
@@ -2718,18 +2731,18 @@ void init_start_screen(S32 location_id)
 		LL_INFOS("AppInit")  << "Bitmap load disabled" << LL_ENDL;
 		return;
 	}
-	else if(!start_image_png->load(temp_str) )
+	else if(!start_image_frmted->load(temp_str) )
 	{
 		LL_WARNS("AppInit") << "Bitmap load failed" << LL_ENDL;
 		gStartTexture = NULL;
 	}
 	else
 	{
-		gStartImageWidth = start_image_png->getWidth();
-		gStartImageHeight = start_image_png->getHeight();
+		gStartImageWidth = start_image_frmted->getWidth();
+		gStartImageHeight = start_image_frmted->getHeight();
 
 		LLPointer<LLImageRaw> raw = new LLImageRaw;
-		if (!start_image_png->decode(raw, 0.0f))
+		if (!start_image_frmted->decode(raw, 0.0f))
 		{
 			LL_WARNS("AppInit") << "Bitmap decode failed" << LL_ENDL;
 			gStartTexture = NULL;

From d72fcfba57c02f2577f3b4f3d132ddfa515dd894 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 13 Jun 2019 19:00:20 +0300
Subject: [PATCH 23/97] SL-11402 Resaving home image if file does not exist

---
 indra/newview/llagent.cpp     | 17 +++++++++++++++++
 indra/newview/llagent.h       |  2 ++
 indra/newview/llappviewer.cpp | 29 ++++++++++++++++++++++++++++-
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 4bd3ca9157..925cec0871 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -3709,6 +3709,23 @@ BOOL LLAgent::getHomePosGlobal( LLVector3d* pos_global )
 	return TRUE;
 }
 
+bool LLAgent::isInHomeRegion()
+{
+	if(!mHaveHomePosition)
+	{
+		return false;
+	}
+	if (!getRegion())
+	{
+		return false;
+	}
+	if (getRegion()->getHandle() != mHomeRegionHandle)
+	{
+		return false;
+	}
+	return true;
+}
+
 void LLAgent::clearVisualParams(void *data)
 {
 	if (isAgentAvatarValid())
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index ea6f68c482..5ba1083d8e 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -233,6 +233,8 @@ public:
 	void			setStartPosition(U32 location_id); // Marks current location as start, sends information to servers
 	void			setHomePosRegion(const U64& region_handle, const LLVector3& pos_region);
 	BOOL			getHomePosGlobal(LLVector3d* pos_global);
+	bool			isInHomeRegion();
+
 private:
     void            setStartPositionSuccess(const LLSD &result);
 
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index f3915b9210..c8dcbb87c1 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -4507,8 +4507,35 @@ void LLAppViewer::saveFinalSnapshot()
 		snap_filename += gDirUtilp->getDirDelimiter();
 		snap_filename += LLStartUp::getScreenLastFilename();
 		// use full pixel dimensions of viewer window (not post-scale dimensions)
-		gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw(), FALSE, TRUE, LLSnapshotModel::SNAPSHOT_TYPE_COLOR, LLSnapshotModel::SNAPSHOT_FORMAT_PNG);
+		gViewerWindow->saveSnapshot(snap_filename,
+									gViewerWindow->getWindowWidthRaw(),
+									gViewerWindow->getWindowHeightRaw(),
+									FALSE,
+									TRUE,
+									LLSnapshotModel::SNAPSHOT_TYPE_COLOR,
+									LLSnapshotModel::SNAPSHOT_FORMAT_PNG);
 		mSavedFinalSnapshot = TRUE;
+
+		if (gAgent.isInHomeRegion())
+		{
+			LLVector3d home;
+			if (gAgent.getHomePosGlobal(&home) && dist_vec(home, gAgent.getPositionGlobal()) < 10)
+			{
+				// We are at home position or close to it, see if we need to create home screenshot
+				// Notes:
+				// 1. It might be beneficial to also replace home if file is too old
+				// 2. This is far from best way/place to update screenshot since location might be not fully loaded,
+				// but we don't have many options
+				std::string snap_home = gDirUtilp->getLindenUserDir();
+				snap_home += gDirUtilp->getDirDelimiter();
+				snap_home += LLStartUp::getScreenHomeFilename();
+				if (!gDirUtilp->fileExists(snap_home))
+				{
+					// We are at home position yet no home image exist, fix it
+					LLFile::copy(snap_filename, snap_home);
+				}
+			}
+		}
 	}
 }
 

From dbd28b862c32398c14e8f76d61e0fea315f1cc8a Mon Sep 17 00:00:00 2001
From: callum_linden <callum@lindenlab.com>
Date: Thu, 13 Jun 2019 12:18:43 -0700
Subject: [PATCH 24/97] Small update to Dullahan : uses an updated versioning
 system to make it easier to track revisions

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 517b3d3d4e..c028ac32ff 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -580,9 +580,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>11362c72e1edae9c98e6cc40d378fd37</string>
+              <string>671f93c9c0198be6181bcdad12eeb1e0</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38952/328700/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-darwin64-528086.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39079/330374/dullahan-1.2.201906131118_75.0.1_gb5e74dd_chromium-75.0.3770.80-darwin64-528163.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -592,9 +592,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>0980cd50e5fed4e68ee78132e5c2e240</string>
+              <string>6044f0b2c2081f2a1cc63ab6e5682bef</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38954/328712/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows-528086.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39081/330385/dullahan-1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows-528163.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -604,16 +604,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>dd072189ea40ed9fa0af0f2caef866ca</string>
+              <string>c00079f01c71ce46f9735174081d44f6</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38953/328705/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows64-528086.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39080/330386/dullahan-1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows64-528163.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80</string>
+        <string>1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80</string>
       </map>
       <key>elfio</key>
       <map>

From 8b650133fcf67bf19a4771afd66b6f99e823f207 Mon Sep 17 00:00:00 2001
From: callum_linden <callum@lindenlab.com>
Date: Thu, 13 Jun 2019 14:08:04 -0700
Subject: [PATCH 25/97] Update CEF binaries to most recent version:
 75.0.6+g90ecd35+chromium-75.0.3770.80 (no Dullahan changes required)

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index c028ac32ff..50add71f55 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -580,9 +580,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>671f93c9c0198be6181bcdad12eeb1e0</string>
+              <string>70397992cf465d3b1a7534d7186771fe</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39079/330374/dullahan-1.2.201906131118_75.0.1_gb5e74dd_chromium-75.0.3770.80-darwin64-528163.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39115/330763/dullahan-1.2.201906131357_75.0.6_g90ecd35_chromium-75.0.3770.80-darwin64-528181.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -592,9 +592,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>6044f0b2c2081f2a1cc63ab6e5682bef</string>
+              <string>7c926f549420f75e90d79a0b25e617dd</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39081/330385/dullahan-1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows-528163.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39117/330772/dullahan-1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80-windows-528181.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -604,16 +604,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>c00079f01c71ce46f9735174081d44f6</string>
+              <string>fd7bb4cc062323887d8de618be289030</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39080/330386/dullahan-1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows64-528163.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39116/330775/dullahan-1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80-windows64-528181.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80</string>
+        <string>1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80</string>
       </map>
       <key>elfio</key>
       <map>

From 1f1b51c7ce9f34978b1caa09a07b972ce07b027f Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 14 Jun 2019 20:27:39 +0300
Subject: [PATCH 26/97] SL-11361 Moving folder to My Outfits should create an
 outfit

---
 indra/newview/llinventorybridge.cpp           | 151 +++++++++++++++++-
 indra/newview/llinventorybridge.h             |   2 +
 .../skins/default/xui/en/notifications.xml    |  10 ++
 .../newview/skins/default/xui/en/strings.xml  |   2 +
 4 files changed, 161 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 64bc486767..349ba6183b 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -107,6 +107,7 @@ bool move_task_inventory_callback(const LLSD& notification, const LLSD& response
 bool confirm_attachment_rez(const LLSD& notification, const LLSD& response);
 void teleport_via_landmark(const LLUUID& asset_id);
 static BOOL can_move_to_outfit(LLInventoryItem* inv_item, BOOL move_is_into_current_outfit);
+static bool can_move_to_my_outfits(LLInventoryModel* model, LLInventoryCategory* inv_cat, U32 wear_limit);
 static BOOL can_move_to_landmarks(LLInventoryItem* inv_item);
 static bool check_category(LLInventoryModel* model,
 						   const LLUUID& cat_id,
@@ -2506,9 +2507,28 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 			is_movable = FALSE;
 			// tooltip?
 		}
+
+		U32 max_items_to_wear = gSavedSettings.getU32("WearFolderLimit");
 		if (is_movable && move_is_into_outfit)
 		{
-			if((mUUID == my_outifts_id) || (getCategory() && getCategory()->getPreferredType() == LLFolderType::FT_NONE))
+			if (mUUID == my_outifts_id)
+			{
+				if (source != LLToolDragAndDrop::SOURCE_AGENT || move_is_from_marketplacelistings)
+				{
+					tooltip_msg = LLTrans::getString("TooltipOutfitNotInInventory");
+					is_movable = false;
+				}
+				else if (can_move_to_my_outfits(model, inv_cat, max_items_to_wear))
+				{
+					is_movable = true;
+				}
+				else
+				{
+					tooltip_msg = LLTrans::getString("TooltipCantCreateOutfit");
+					is_movable = false;
+				}
+			}
+			else if(getCategory() && getCategory()->getPreferredType() == LLFolderType::FT_NONE)
 			{
 				is_movable = ((inv_cat->getPreferredType() == LLFolderType::FT_NONE) || (inv_cat->getPreferredType() == LLFolderType::FT_OUTFIT));
 			}
@@ -2553,7 +2573,6 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 				}
 			}
 		}
-		U32 max_items_to_wear = gSavedSettings.getU32("WearFolderLimit");
 		if (is_movable
 			&& move_is_into_current_outfit
 			&& descendent_items.size() > max_items_to_wear)
@@ -2708,8 +2727,14 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 				}
 			}
 
+			if (mUUID == my_outifts_id)
+			{
+				// Category can contains objects,
+				// create a new folder and populate it with links to original objects
+				dropToMyOutfits(inv_cat);
+			}
 			// if target is current outfit folder we use link
-			if (move_is_into_current_outfit &&
+			else if (move_is_into_current_outfit &&
 				(inv_cat->getPreferredType() == LLFolderType::FT_NONE ||
 				inv_cat->getPreferredType() == LLFolderType::FT_OUTFIT))
 			{
@@ -3719,12 +3744,40 @@ void LLFolderBridge::perform_pasteFromClipboard()
 						return;
 					}
 				}
-				if (move_is_into_current_outfit || move_is_into_outfit)
+				if (move_is_into_outfit)
+				{
+					if (!move_is_into_my_outfits && item && can_move_to_outfit(item, move_is_into_current_outfit))
+					{
+						dropToOutfit(item, move_is_into_current_outfit);
+					}
+					else if (move_is_into_my_outfits && LLAssetType::AT_CATEGORY == obj->getType())
+					{
+						LLInventoryCategory* cat = model->getCategory(item_id);
+						U32 max_items_to_wear = gSavedSettings.getU32("WearFolderLimit");
+						if (cat && can_move_to_my_outfits(model, cat, max_items_to_wear))
+						{
+							dropToMyOutfits(cat);
+						}
+						else
+						{
+							LLNotificationsUtil::add("MyOutfitsPasteFailed");
+						}
+					}
+					else
+					{
+						LLNotificationsUtil::add("MyOutfitsPasteFailed");
+					}
+				}
+				else if (move_is_into_current_outfit)
 				{
 					if (item && can_move_to_outfit(item, move_is_into_current_outfit))
 					{
 						dropToOutfit(item, move_is_into_current_outfit);
 					}
+					else
+					{
+						LLNotificationsUtil::add("MyOutfitsPasteFailed");
+					}
 				}
 				else if (move_is_into_favorites)
 				{
@@ -4670,6 +4723,46 @@ static BOOL can_move_to_outfit(LLInventoryItem* inv_item, BOOL move_is_into_curr
 	return TRUE;
 }
 
+// Returns true if folder's content can be moved to Current Outfit or any outfit folder.
+static bool can_move_to_my_outfits(LLInventoryModel* model, LLInventoryCategory* inv_cat, U32 wear_limit)
+{
+    LLInventoryModel::cat_array_t *cats;
+    LLInventoryModel::item_array_t *items;
+    model->getDirectDescendentsOf(inv_cat->getUUID(), cats, items);
+
+    if (items->size() > wear_limit)
+    {
+        return false;
+    }
+
+    if (items->size() == 0)
+    {
+        // Nothing to move(create)
+        return false;
+    }
+
+    if (cats->size() > 0)
+    {
+        // We do not allow subfolders in outfits of "My Outfits" yet
+        return false;
+    }
+
+    LLInventoryModel::item_array_t::iterator iter = items->begin();
+    LLInventoryModel::item_array_t::iterator end = items->end();
+
+    while (iter != end)
+    {
+        LLViewerInventoryItem *item = *iter;
+        if (!can_move_to_outfit(item, false))
+        {
+            return false;
+        }
+        iter++;
+    }
+
+    return true;
+}
+
 // Returns TRUE if item is a landmark or a link to a landmark
 // and can be moved to Favorites or Landmarks folder.
 static BOOL can_move_to_landmarks(LLInventoryItem* inv_item)
@@ -4738,6 +4831,56 @@ void LLFolderBridge::dropToOutfit(LLInventoryItem* inv_item, BOOL move_is_into_c
 	}
 }
 
+void LLFolderBridge::dropToMyOutfits(LLInventoryCategory* inv_cat)
+{
+    // make a folder in the My Outfits directory.
+    const LLUUID dest_id = getInventoryModel()->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
+
+    // Note: creation will take time, so passing folder id to callback is slightly unreliable,
+    // but so is collecting and passing descendants' ids
+    inventory_func_type func = boost::bind(&LLFolderBridge::outfitFolderCreatedCallback, this, inv_cat->getUUID(), _1);
+    gInventory.createNewCategory(dest_id,
+                                 LLFolderType::FT_OUTFIT,
+                                 inv_cat->getName(),
+                                 func);
+}
+
+void LLFolderBridge::outfitFolderCreatedCallback(LLUUID cat_source_id, LLUUID cat_dest_id)
+{
+    LLInventoryModel::cat_array_t* categories;
+    LLInventoryModel::item_array_t* items;
+    getInventoryModel()->getDirectDescendentsOf(cat_source_id, categories, items);
+
+    LLInventoryObject::const_object_list_t link_array;
+
+
+    LLInventoryModel::item_array_t::iterator iter = items->begin();
+    LLInventoryModel::item_array_t::iterator end = items->end();
+    while (iter!=end)
+    {
+        const LLViewerInventoryItem* item = (*iter);
+        // By this point everything is supposed to be filtered,
+        // but there was a delay to create folder so something could have changed
+        LLInventoryType::EType inv_type = item->getInventoryType();
+        if ((inv_type == LLInventoryType::IT_WEARABLE) ||
+            (inv_type == LLInventoryType::IT_GESTURE) ||
+            (inv_type == LLInventoryType::IT_ATTACHMENT) ||
+            (inv_type == LLInventoryType::IT_OBJECT) ||
+            (inv_type == LLInventoryType::IT_SNAPSHOT) ||
+            (inv_type == LLInventoryType::IT_TEXTURE))
+        {
+            link_array.push_back(LLConstPointer<LLInventoryObject>(item));
+        }
+        iter++;
+    }
+
+    if (!link_array.empty())
+    {
+        LLPointer<LLInventoryCallback> cb = NULL;
+        link_inventory_array(cat_dest_id, link_array, cb);
+    }
+}
+
 // Callback for drop item if DAMA required...
 void LLFolderBridge::callback_dropItemIntoFolder(const LLSD& notification, const LLSD& response, LLInventoryItem* inv_item)
 {
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index f4df566fa6..0823cf8b52 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -359,6 +359,7 @@ protected:
 
 	void dropToFavorites(LLInventoryItem* inv_item);
 	void dropToOutfit(LLInventoryItem* inv_item, BOOL move_is_into_current_outfit);
+	void dropToMyOutfits(LLInventoryCategory* inv_cat);
 
 	//--------------------------------------------------------------------
 	// Messy hacks for handling folder options
@@ -368,6 +369,7 @@ public:
 	static void staticFolderOptionsMenu();
 
 protected:
+    void outfitFolderCreatedCallback(LLUUID cat_source_id, LLUUID cat_dest_id);
     void callback_pasteFromClipboard(const LLSD& notification, const LLSD& response);
     void perform_pasteFromClipboard();
     void gatherMessage(std::string& message, S32 depth, LLError::ELevel log_level);
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6e710f053c..465652cfde 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -326,6 +326,16 @@ Initialization with the Marketplace failed because of a system or network error.
         name="okbutton"
         yestext="OK"/>
     </notification>
+  
+    <notification
+        icon="OutboxStatus_Error"
+        name="MyOutfitsPasteFailed"
+        type="alertmodal">
+       One or more items can't be used inside "My outfits"
+      <usetemplate
+        name="okbutton"
+        yestext="OK"/>
+    </notification>
     
     <notification
         icon="OutboxStatus_Error"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 8fa339a946..71ab490547 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -263,6 +263,8 @@ Please try logging in again in a minute.</string>
 	<string name="TooltipOutboxDragActive">You can't move a listed listing</string>
 	<string name="TooltipOutboxCannotMoveRoot">You can't move the marketplace listings root folder</string>
 	<string name="TooltipOutboxMixedStock">All items in a stock folder must have the same type and permission</string>
+	<string name="TooltipOutfitNotInInventory">You can only put items or outfits from your personal inventory into "My outfits"</string>
+	<string name="TooltipCantCreateOutfit">One or more items can't be used inside "My outfits"</string>
 	
 	<string name="TooltipDragOntoOwnChild">You can't move a folder into its child</string>
 	<string name="TooltipDragOntoSelf">You can't move a folder into itself</string>

From 0574d03bfa60191fd06a11f157b86c1862ae6059 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Mon, 17 Jun 2019 19:46:20 +0300
Subject: [PATCH 27/97] OPEN-345 Fixed enigmatic messages during build

---
 doc/contributions.txt               | 1 +
 indra/cmake/BuildPackagesInfo.cmake | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 29fc71510b..4d976ff31d 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1447,6 +1447,7 @@ Tonya Souther
 	STORM-1905
 	BUG-3875
 	BUG-3968
+	OPEN-345
 Torben Trautman
 TouchaHoney Perhaps
 TraductoresAnonimos Alter
diff --git a/indra/cmake/BuildPackagesInfo.cmake b/indra/cmake/BuildPackagesInfo.cmake
index 93461cea95..4314cca33d 100644
--- a/indra/cmake/BuildPackagesInfo.cmake
+++ b/indra/cmake/BuildPackagesInfo.cmake
@@ -8,7 +8,7 @@ include(Python)
 # building in an IDE, it probably isn't. Set it explicitly using
 # run_build_test.py.
 add_custom_command(OUTPUT packages-info.txt
-  COMMENT Generating packages-info.txt for the about box
+  COMMENT "Generating packages-info.txt for the about box"
   MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/../autobuild.xml
   DEPENDS ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py
           ${CMAKE_SOURCE_DIR}/../autobuild.xml

From bf54adf20c85065721ce54a9b09560d4d660bcc1 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Mon, 17 Jun 2019 20:38:27 +0300
Subject: [PATCH 28/97] Updated Viewer Manager to version 2.0.528205

---
 autobuild.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 5f072512c1..8b1a07333c 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>aaf04f5ed1d28477781d976dc04871ee</string>
+              <string>0c7d5d7f3f0cc3e3df3ab7fbc3dceacf</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31904/266163/viewer_manager-2.0.524157-darwin64-524157.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39152/331381/viewer_manager-2.0.528205-darwin64-528205.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>4604624f11b215b052f4a840f4da4bf8</string>
+              <string>8b859303e242a98141746e3e3c7d78f7</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31906/266177/viewer_manager-2.0.524157-windows-524157.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39149/331365/viewer_manager-2.0.528205-windows-528205.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>source_type</key>
         <string>hg</string>
         <key>version</key>
-        <string>2.0.524157</string>
+        <string>2.0.528205</string>
       </map>
       <key>vlc-bin</key>
       <map>

From 1bb86f3f98bda3bae3eb005c0bc27db1ea0dfe37 Mon Sep 17 00:00:00 2001
From: callum_linden <callum@lindenlab.com>
Date: Mon, 17 Jun 2019 16:57:59 -0700
Subject: [PATCH 29/97] Bump CEF version (via 3p-cef-bin-*) slightly to
 75.0.7+g19229b6+chromium-75.0.3770.80

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 50add71f55..be4219b279 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -580,9 +580,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>70397992cf465d3b1a7534d7186771fe</string>
+              <string>914d49e4951b77c61df2e786a5791fb5</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39115/330763/dullahan-1.2.201906131357_75.0.6_g90ecd35_chromium-75.0.3770.80-darwin64-528181.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39275/332265/dullahan-1.2.201906171653_75.0.7_g19229b6_chromium-75.0.3770.80-darwin64-528294.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -592,9 +592,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>7c926f549420f75e90d79a0b25e617dd</string>
+              <string>e3108ed152d61d0d75d723698944802c</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39117/330772/dullahan-1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80-windows-528181.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39276/332272/dullahan-1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80-windows-528294.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -604,16 +604,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>fd7bb4cc062323887d8de618be289030</string>
+              <string>2f4fe577dc0247a23dbfee6e2a965a21</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39116/330775/dullahan-1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80-windows64-528181.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39277/332276/dullahan-1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80-windows64-528294.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80</string>
+        <string>1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80</string>
       </map>
       <key>elfio</key>
       <map>

From 8de9d6b40698c36a270a50cf507faca4c440f311 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 19 Jun 2019 18:06:22 +0300
Subject: [PATCH 30/97] SL-11416 Teleport failure messages should not stack up

---
 indra/newview/skins/default/xui/en/notifications.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 465652cfde..f72767cceb 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2396,6 +2396,7 @@ Your search terms were too short so no search was performed.
    icon="alertmodal.tga"
    name="CouldNotTeleportReason"
    type="alertmodal">
+    <unique/>
 Teleport failed.
 [REASON]
   <tag>fail</tag>

From ea045c4fdfeeeaca30813b5f17ba61e249eda5b5 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 19 Jun 2019 20:36:58 +0300
Subject: [PATCH 31/97] SL-11450 After detaching everything viewer shows wrong
 slot count Attachments' title not overwriting properly

---
 indra/newview/llcofwearables.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llcofwearables.cpp b/indra/newview/llcofwearables.cpp
index b47e0930a3..1caefd58ab 100644
--- a/indra/newview/llcofwearables.cpp
+++ b/indra/newview/llcofwearables.cpp
@@ -502,13 +502,14 @@ void LLCOFWearables::populateAttachmentsAndBodypartsLists(const LLInventoryModel
 	{
 		mAttachments->sort();
 		mAttachments->notify(REARRANGE); //notifying the parent about the list's size change (cause items were added with rearrange=false)
-		setAttachmentsTitle();
 	}
 	else
 	{
 		mAttachments->setNoItemsCommentText(LLTrans::getString("no_attachments"));
 	}
 
+	setAttachmentsTitle();
+
 	if (mBodyParts->size())
 	{
 		mBodyParts->sort();

From 295dd81fa36571585b5215c9da6709d7c350c51f Mon Sep 17 00:00:00 2001
From: callum_linden <callum@lindenlab.com>
Date: Wed, 19 Jun 2019 12:14:28 -0700
Subject: [PATCH 32/97] Bump version of CEF we build against to
 75.0.8+g5da93a1+chromium-75.0.3770.80

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index be4219b279..d25b73dba2 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -580,9 +580,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>914d49e4951b77c61df2e786a5791fb5</string>
+              <string>063d23fc17a12cc523c1339797e6ab2f</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39275/332265/dullahan-1.2.201906171653_75.0.7_g19229b6_chromium-75.0.3770.80-darwin64-528294.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39378/333003/dullahan-1.2.201906191209_75.0.8_g5da93a1_chromium-75.0.3770.80-darwin64-528361.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -592,9 +592,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e3108ed152d61d0d75d723698944802c</string>
+              <string>dc407cb4676b40de44222e7b5a01b511</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39276/332272/dullahan-1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80-windows-528294.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39381/333016/dullahan-1.2.201906191911_75.0.8_g5da93a1_chromium-75.0.3770.80-windows-528361.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -604,16 +604,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>2f4fe577dc0247a23dbfee6e2a965a21</string>
+              <string>bbab698b2807da3c2a3dc94de3aa3084</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39277/332276/dullahan-1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80-windows64-528294.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39380/333017/dullahan-1.2.201906191911_75.0.8_g5da93a1_chromium-75.0.3770.80-windows64-528361.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80</string>
+        <string>1.2.201906191911_75.0.8_g5da93a1_chromium-75.0.3770.80</string>
       </map>
       <key>elfio</key>
       <map>

From 41ba3d54edf9f1829ece547f1fca8661711249d6 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 20 Jun 2019 10:11:36 +0200
Subject: [PATCH 33/97] Update German translation

---
 indra/newview/skins/default/xui/de/notifications.xml | 4 ++++
 indra/newview/skins/default/xui/de/strings.xml       | 5 +++++
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 indra/newview/skins/default/xui/en/strings.xml       | 4 ++--
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 7dcc5daac3..c75b73be8f 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -139,6 +139,10 @@ Marktplatzinitialisierung aufgrund eines System- oder Netzwerkfehlers fehlgeschl
         „[ERROR_CODE]“
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="MyOutfitsPasteFailed">
+		Ein oder mehrere Objekte können nicht innerhalb von „Outfits“ verwendet werden.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="MerchantPasteFailed">
 		Kopieren oder Verschieben von Marktplatz-Auflistungen fehlgeschlagen mit Fehler:
         
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 8e326228d0..15f2024985 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -648,6 +648,11 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="TooltipOutboxMixedStock">
 		Alle Objekte in einem Bestandsordner müssen vom gleichen Typ sein und die gleiche Berechtigung haben
 	</string>
+	<string name="TooltipOutfitNotInInventory">
+		Sie können nur Objekte oder Outfits aus Ihrem persönlichen Inventar zu „Outfits“ hinzufügen.
+	<string name="TooltipCantCreateOutfit">
+		Ein oder mehrere Objekte können nicht innerhalb von „Outfits“ verwendet werden.
+	</string>
 	<string name="TooltipDragOntoOwnChild">
 		Sie können einen Ordner nicht in einen seiner untergeordneten Ordner verschieben
 	</string>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 343ff99cdf..84dd0f206f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -332,7 +332,7 @@ Initialization with the Marketplace failed because of a system or network error.
         icon="OutboxStatus_Error"
         name="MyOutfitsPasteFailed"
         type="alertmodal">
-       One or more items can't be used inside "My outfits"
+       One or more items can't be used inside "Outfits"
       <usetemplate
         name="okbutton"
         yestext="OK"/>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 5ad8e87db4..60f1b488ee 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -313,8 +313,8 @@ Please try logging in again in a minute.</string>
 	<string name="TooltipOutboxDragActive">You can't move a listed listing</string>
 	<string name="TooltipOutboxCannotMoveRoot">You can't move the marketplace listings root folder</string>
 	<string name="TooltipOutboxMixedStock">All items in a stock folder must have the same type and permission</string>
-	<string name="TooltipOutfitNotInInventory">You can only put items or outfits from your personal inventory into "My outfits"</string>
-	<string name="TooltipCantCreateOutfit">One or more items can't be used inside "My outfits"</string>
+	<string name="TooltipOutfitNotInInventory">You can only put items or outfits from your personal inventory into "Outfits"</string>
+	<string name="TooltipCantCreateOutfit">One or more items can't be used inside "Outfits"</string>
 	
 	<string name="TooltipDragOntoOwnChild">You can't move a folder into its child</string>
 	<string name="TooltipDragOntoSelf">You can't move a folder into itself</string>

From fd639e6ccab0b0298ce5b629da0ce5daf345a285 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 20 Jun 2019 11:09:01 +0200
Subject: [PATCH 34/97] Increase width of "About" floater

---
 indra/newview/skins/default/xui/en/floater_about.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index ff31222a61..b5d5d54e36 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -8,14 +8,14 @@
  help_topic="floater_about"
  save_rect="true"
  title="About [APP_NAME]"
- width="500">
+ width="515">
   
   <tab_container
     follows="all" 
     top="20"
     left="7"
     height="572" 
-    width="486" 
+    width="501" 
     name="about_tab"
     tab_position="top">
     <panel
@@ -46,7 +46,7 @@ http://www.firestormviewer.org
         max_length="65536"
         name="support_editor"
         top_pad="5"
-        width="474"
+        width="489"
         word_wrap="true" />
       <button
         follows="left|top" 
@@ -69,7 +69,7 @@ http://www.firestormviewer.org
         left="4"
         name="linden_intro"
         top="16"
-        width="474"
+        width="489"
         wrap="true">
 Firestorm would not be possible without the decision from Linden Lab to make their Second Life viewer source code available.
 

From b813814202d0c3c011df9f514b73afe7b1758b3c Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 20 Jun 2019 15:41:27 +0300
Subject: [PATCH 35/97] SL-11432 FIXED [OSX] Avatar is spinning when pressing
 Alt+D+Command and then releasing D key

---
 indra/llwindow/llappdelegate-objc.h |  3 +++
 indra/llwindow/llopenglview-objc.mm |  9 ---------
 indra/newview/CMakeLists.txt        |  2 +-
 indra/newview/llappdelegate-objc.mm | 13 +++++++++++++
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/indra/llwindow/llappdelegate-objc.h b/indra/llwindow/llappdelegate-objc.h
index 6daf1ac55b..0b38647b4a 100644
--- a/indra/llwindow/llappdelegate-objc.h
+++ b/indra/llwindow/llappdelegate-objc.h
@@ -46,3 +46,6 @@
 - (void) languageUpdated;
 - (bool) romanScript;
 @end
+
+@interface LLApplication : NSApplication
+@end
diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index 33eed7227a..1990499459 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -509,15 +509,6 @@ attributedStringInfo getSegments(NSAttributedString *str)
     {
         [[self inputContext] handleEvent:theEvent];
     }
-    
-    // OS X intentionally does not send us key-up information on cmd-key combinations.
-    // This behaviour is not a bug, and only applies to cmd-combinations (no others).
-    // Since SL assumes we receive those, we fake it here.
-    if (mModifiers & NSCommandKeyMask && !mHasMarkedText)
-    {
-        eventData.mKeyEvent = NativeKeyEventData::KEYUP;
-        callKeyUp(&eventData, [theEvent keyCode], mModifiers);
-    }
 }
 
 - (void)flagsChanged:(NSEvent *)theEvent
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 46fd0f3fd1..b8789da66b 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2117,7 +2117,7 @@ if (DARWIN)
   set(MACOSX_BUNDLE_BUNDLE_VERSION "${VIEWER_SHORT_VERSION}${VIEWER_MACOSX_PHASE}${VIEWER_REVISION}")
   set(MACOSX_BUNDLE_COPYRIGHT "Copyright © Linden Research, Inc. 2018")
   set(MACOSX_BUNDLE_NSMAIN_NIB_FILE "SecondLife.nib")
-  set(MACOSX_BUNDLE_NSPRINCIPAL_CLASS "NSApplication")
+  set(MACOSX_BUNDLE_NSPRINCIPAL_CLASS "LLApplication")
 
   # https://blog.kitware.com/upcoming-in-cmake-2-8-12-osx-rpath-support/
   set(CMAKE_MACOSX_RPATH 1)
diff --git a/indra/newview/llappdelegate-objc.mm b/indra/newview/llappdelegate-objc.mm
index 1d55537427..47fde299c7 100644
--- a/indra/newview/llappdelegate-objc.mm
+++ b/indra/newview/llappdelegate-objc.mm
@@ -342,3 +342,16 @@ struct AttachmentInfo
 #endif // LL_BUGSPLAT
 
 @end
+
+@implementation LLApplication
+
+- (void)sendEvent:(NSEvent *)event
+{
+    [super sendEvent:event];
+    if ([event type] == NSKeyUp && ([event modifierFlags] & NSCommandKeyMask))
+    {   
+        [[self keyWindow] sendEvent:event];
+    }
+}
+
+@end

From ec8a65a50ac85c4d99043e32691fcd25a06b01f3 Mon Sep 17 00:00:00 2001
From: callum_linden <callum@lindenlab.com>
Date: Fri, 21 Jun 2019 17:16:05 -0700
Subject: [PATCH 36/97] Update CEF to version
 75.0.11+gf50b3c2+chromium-75.0.3770.100

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index d25b73dba2..5f4dfce4e0 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -580,9 +580,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>063d23fc17a12cc523c1339797e6ab2f</string>
+              <string>29e72f220f3d4b8899ce48ee5263c62e</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39378/333003/dullahan-1.2.201906191209_75.0.8_g5da93a1_chromium-75.0.3770.80-darwin64-528361.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39570/336600/dullahan-1.2.201906211704_75.0.11_gf50b3c2_chromium-75.0.3770.100-darwin64-528487.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -592,9 +592,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>dc407cb4676b40de44222e7b5a01b511</string>
+              <string>022aed6a323c0a2d80775555b6713bf4</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39381/333016/dullahan-1.2.201906191911_75.0.8_g5da93a1_chromium-75.0.3770.80-windows-528361.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39571/336606/dullahan-1.2.201906220004_75.0.11_gf50b3c2_chromium-75.0.3770.100-windows-528487.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -604,16 +604,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>bbab698b2807da3c2a3dc94de3aa3084</string>
+              <string>5e9f605450feb22b01f81b26d1898eab</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39380/333017/dullahan-1.2.201906191911_75.0.8_g5da93a1_chromium-75.0.3770.80-windows64-528361.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39572/336611/dullahan-1.2.201906220004_75.0.11_gf50b3c2_chromium-75.0.3770.100-windows64-528487.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.2.201906191911_75.0.8_g5da93a1_chromium-75.0.3770.80</string>
+        <string>1.2.201906220004_75.0.11_gf50b3c2_chromium-75.0.3770.100</string>
       </map>
       <key>elfio</key>
       <map>

From f486bdbb48dda1364d71b8d80cc3c837efb96284 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 10 Jul 2019 16:51:45 +0300
Subject: [PATCH 37/97] SL-11563 Version checker crashing with 'no module
 epolls' error

---
 autobuild.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 2a2c1c8de9..85b9ba9976 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>0c7d5d7f3f0cc3e3df3ab7fbc3dceacf</string>
+              <string>42066e2447c7a3359784438d16510992</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39152/331381/viewer_manager-2.0.528205-darwin64-528205.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/40539/348124/viewer_manager-2.0.529188-darwin64-529188.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8b859303e242a98141746e3e3c7d78f7</string>
+              <string>ca230428635ce13cb7ace0f9522f8546</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39149/331365/viewer_manager-2.0.528205-windows-528205.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/40538/348130/viewer_manager-2.0.529188-windows-529188.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>source_type</key>
         <string>hg</string>
         <key>version</key>
-        <string>2.0.528205</string>
+        <string>2.0.529188</string>
       </map>
       <key>vlc-bin</key>
       <map>

From 8d77d51e636f5384b0b024350a0a219e041b5446 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 15 Jul 2019 17:56:30 +0300
Subject: [PATCH 38/97] SL-10908 Safeguards and potential crash fix

---
 indra/newview/llcontrolavatar.cpp    | 9 ++++++---
 indra/newview/llsky.cpp              | 2 +-
 indra/newview/llsurfacepatch.cpp     | 2 +-
 indra/newview/llviewerobjectlist.cpp | 6 +++++-
 indra/newview/llworld.cpp            | 4 ++--
 indra/newview/llworld.h              | 2 +-
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index d24dac385f..92eeebd705 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -327,10 +327,13 @@ LLControlAvatar *LLControlAvatar::createControlAvatar(LLVOVolume *obj)
 {
 	LLControlAvatar *cav = (LLControlAvatar*)gObjectList.createObjectViewer(LL_PCODE_LEGACY_AVATAR, gAgent.getRegion(), CO_FLAG_CONTROL_AVATAR);
 
-    cav->mRootVolp = obj;
+    if (cav)
+    {
+        cav->mRootVolp = obj;
 
-    // Sync up position/rotation with object
-    cav->matchVolumeTransform();
+        // Sync up position/rotation with object
+        cav->matchVolumeTransform();
+    }
 
     return cav;
 }
diff --git a/indra/newview/llsky.cpp b/indra/newview/llsky.cpp
index 3ef89ba920..5e2442798b 100644
--- a/indra/newview/llsky.cpp
+++ b/indra/newview/llsky.cpp
@@ -119,7 +119,7 @@ void LLSky::restoreGL()
 
 void LLSky::resetVertexBuffers()
 {
-	if (gSky.mVOSkyp.notNull())
+	if (gSky.mVOSkyp.notNull() && gSky.mVOGroundp.notNull())
 	{
 		gPipeline.resetVertexBuffers(gSky.mVOSkyp->mDrawable);
 		gPipeline.resetVertexBuffers(gSky.mVOGroundp->mDrawable);
diff --git a/indra/newview/llsurfacepatch.cpp b/indra/newview/llsurfacepatch.cpp
index f6cf714db4..5e056944e9 100644
--- a/indra/newview/llsurfacepatch.cpp
+++ b/indra/newview/llsurfacepatch.cpp
@@ -203,7 +203,7 @@ LLVector2 LLSurfacePatch::getTexCoords(const U32 x, const U32 y) const
 void LLSurfacePatch::eval(const U32 x, const U32 y, const U32 stride, LLVector3 *vertex, LLVector3 *normal,
 						  LLVector2 *tex0, LLVector2 *tex1)
 {
-	if (!mSurfacep || !mSurfacep->getRegion() || !mSurfacep->getGridsPerEdge())
+	if (!mSurfacep || !mSurfacep->getRegion() || !mSurfacep->getGridsPerEdge() || !mVObjp)
 	{
 		return; // failsafe
 	}
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 932759c86d..2bf04dc204 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -1383,7 +1383,11 @@ BOOL LLViewerObjectList::killObject(LLViewerObject *objectp)
 
 	if (objectp)
 	{
-		objectp->markDead(); // does the right thing if object already dead
+		// We are going to cleanup a lot of smart pointers to this object, they might be last,
+		// and object being NULLed while inside it's own function won't be pretty
+		// so create a pointer to make sure object will stay alive untill markDead() finishes
+		LLPointer<LLViewerObject> sp(objectp);
+		sp->markDead(); // does the right thing if object already dead
 		return TRUE;
 	}
 
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index cee47a591e..89f5eb86b3 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -916,10 +916,10 @@ void LLWorld::updateWaterObjects()
 		}
 	}
 
-	for (std::list<LLVOWater*>::iterator iter = mHoleWaterObjects.begin();
+	for (std::list<LLPointer<LLVOWater> >::iterator iter = mHoleWaterObjects.begin();
 		 iter != mHoleWaterObjects.end(); ++ iter)
 	{
-		LLVOWater* waterp = *iter;
+		LLVOWater* waterp = (*iter).get();
 		gObjectList.killObject(waterp);
 	}
 	mHoleWaterObjects.clear();
diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h
index c9ac241d5a..993fbfb2cc 100644
--- a/indra/newview/llworld.h
+++ b/indra/newview/llworld.h
@@ -199,7 +199,7 @@ private:
 	// Data for "Fake" objects
 	//
 
-	std::list<LLVOWater*> mHoleWaterObjects;
+	std::list<LLPointer<LLVOWater> > mHoleWaterObjects;
 	LLPointer<LLVOWater> mEdgeWaterObjects[8];
 
 	LLPointer<LLViewerTexture> mDefaultWaterTexturep;

From a6666322ed66a05566bf50e5d2e8fb1284cbfb4e Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 11 Sep 2019 22:04:02 +0200
Subject: [PATCH 39/97] Simplify including of Discord rich presence files

---
 indra/newview/CMakeLists.txt | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 5fc7b0d116..2bcb6a09a4 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1631,6 +1631,13 @@ configure_file(
 list(APPEND viewer_HEADER_FILES ${CMAKE_CURRENT_BINARY_DIR}/exoflickrkeys.h)
 # </exodus>
 
+#<FS:LO> Discord rich presence
+  if (USE_DISCORD)
+    LIST(APPEND viewer_HEADER_FILES fsfloaterdiscord.h fsdiscordconnect.h)
+    LIST(APPEND viewer_SOURCE_FILES fsfloaterdiscord.cpp fsdiscordconnect.cpp)
+  endif (USE_DISCORD)
+#</FS:LO>
+
 # <FS:TS> Generate the version information header file.
 configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/fsversionvalues.h.in
@@ -1687,13 +1694,6 @@ if (DARWIN)
          )
 # [FS]
 
-#<FS:LO> Discord rich presence
-  if( USE_DISCORD )
-    LIST(APPEND viewer_HEADER_FILES fsfloaterdiscord.h fsdiscordconnect.h)
-    LIST(APPEND viewer_SOURCE_FILES fsfloaterdiscord.cpp fsdiscordconnect.cpp)
-  endif()
-#</FS:LO>
-
   find_library(AGL_LIBRARY AGL)
   find_library(APPKIT_LIBRARY AppKit)
   find_library(COCOA_LIBRARY Cocoa)
@@ -1753,13 +1753,6 @@ if (LINUX)
     LIST(APPEND viewer_SOURCE_FILES desktopnotifierlinux.cpp growlmanager.cpp)
 # [FS] Growl support
 
-#<FS:LO> Discord rich presence
-  if( USE_DISCORD )
-    LIST(APPEND viewer_HEADER_FILES fsfloaterdiscord.h fsdiscordconnect.h)
-    LIST(APPEND viewer_SOURCE_FILES fsfloaterdiscord.cpp fsdiscordconnect.cpp)
-  endif()
-#</FS:LO>
-
     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
 
     set(viewer_LIBRARIES
@@ -1803,13 +1796,6 @@ if (WINDOWS)
 # [FS]
          )
 
-#<FS:LO> Discord rich presence
-  if( USE_DISCORD )
-    LIST(APPEND viewer_HEADER_FILES fsfloaterdiscord.h fsdiscordconnect.h)
-    LIST(APPEND viewer_SOURCE_FILES fsfloaterdiscord.cpp fsdiscordconnect.cpp)
-  endif()
-#</FS:LO>
-
     # precompiled header configuration
     # llviewerprecompiledheaders.cpp generates
     # the .pch file.

From 5b0865d7a7a41da688a994cec7abd48ac131fc8c Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 11 Sep 2019 22:10:45 +0200
Subject: [PATCH 40/97] Update German translation

---
 indra/newview/skins/default/xui/de/floater_fs_area_search.xml | 1 +
 indra/newview/skins/default/xui/de/menu_fs_area_search.xml    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/indra/newview/skins/default/xui/de/floater_fs_area_search.xml b/indra/newview/skins/default/xui/de/floater_fs_area_search.xml
index 6219da5cba..b01ac3b095 100644
--- a/indra/newview/skins/default/xui/de/floater_fs_area_search.xml
+++ b/indra/newview/skins/default/xui/de/floater_fs_area_search.xml
@@ -114,6 +114,7 @@
 		<panel label="Erweitert" name="area_search_advanced_panel">
 			<check_box name="double_click_touch" label="Doppelklick berührt Objekt"/>
 			<check_box name="double_click_buy" label="Doppelklick kauft Objekt"/>
+			<check_box name="double_click_sit" label="Doppelklick sitzt auf Objekt"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/menu_fs_area_search.xml b/indra/newview/skins/default/xui/de/menu_fs_area_search.xml
index 7fcc8c5b59..1548a33270 100644
--- a/indra/newview/skins/default/xui/de/menu_fs_area_search.xml
+++ b/indra/newview/skins/default/xui/de/menu_fs_area_search.xml
@@ -2,6 +2,7 @@
 <context_menu name="Object List popup">
 	<menu_item_call label="Skript-Info" name="script_info"/>
 	<menu_item_call label="Berühren" name="touch_object"/>
+	<menu_item_call label="Sitzen" name="sit_on_object"/>
 	<menu_item_call label="Zu Objekt teleportieren" name="teleport_to_object"/>
 	<menu_item_call label="Heranzoomen" name="look_at_object"/>
 	<menu_item_call label="Untersuchen" name="inspect_object"/>

From d07ff62c74ccb53c07deddfe96c44a32d416c62f Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Thu, 5 Sep 2019 23:46:59 +0300
Subject: [PATCH 41/97] SL-11848 Fixed login crash (Face with no texture index
 references indexed texture draw info)

---
 indra/newview/llface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 555674682d..07cd822fce 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -478,7 +478,7 @@ void LLFace::setTextureIndex(U8 index)
 		}
 		else
 		{
-			if (mDrawInfo && !mDrawInfo->mTextureList.empty())
+			if (mDrawInfo && mDrawInfo->mTextureList.size() <= 1)
 			{
 				LL_ERRS() << "Face with no texture index references indexed texture draw info." << LL_ENDL;
 			}

From a488a39f45229d1400aa3d9e29152f114004e4d9 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 6 Sep 2019 18:27:06 +0200
Subject: [PATCH 42/97] Sync this indentation screw-up separately

---
 indra/newview/llvoavatar.cpp | 1067 +++++++++++++++++-----------------
 1 file changed, 535 insertions(+), 532 deletions(-)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index a94a1b3312..678771167e 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -720,6 +720,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
 	mMeshTexturesDirty = FALSE;
 	mHeadp = NULL;
 
+
 	// set up animation variables
 	mSpeed = 0.f;
 	setAnimationData("Speed", &mSpeed);
@@ -782,8 +783,8 @@ std::string LLVOAvatar::avString() const
     }
     else
     {
-        std::string viz_string = LLVOAvatar::rezStatusToString(getRezzedStatus());
-        return " Avatar '" + getFullname() + "' " + viz_string + " ";
+	std::string viz_string = LLVOAvatar::rezStatusToString(getRezzedStatus());
+	return " Avatar '" + getFullname() + "' " + viz_string + " ";
     }
 }
 
@@ -1404,7 +1405,7 @@ void LLVOAvatar::calculateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax)
     if (dist_vec(zero_pos, mPelvisp->getWorldPosition())<0.001)
     {
         // Don't use pelvis until av initialized
-        pos.load3(getRenderPosition().mV);
+	pos.load3(getRenderPosition().mV);
     }
     else
     {
@@ -1418,16 +1419,16 @@ void LLVOAvatar::calculateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax)
 	//displayed, can give inaccurate boxes due to joints stuck at (0,0,0).
     if ((box_detail>=1) && !isControlAvatar())
     {
-        for (polymesh_map_t::iterator i = mPolyMeshes.begin(); i != mPolyMeshes.end(); ++i)
-        {
-            LLPolyMesh* mesh = i->second;
-            for (S32 joint_num = 0; joint_num < mesh->mJointRenderData.size(); joint_num++)
-            {
-                LLVector4a trans;
-                trans.load3( mesh->mJointRenderData[joint_num]->mWorldMatrix->getTranslation().mV);
-                update_min_max(newMin, newMax, trans);
-            }
-        }
+	for (polymesh_map_t::iterator i = mPolyMeshes.begin(); i != mPolyMeshes.end(); ++i)
+	{
+		LLPolyMesh* mesh = i->second;
+		for (S32 joint_num = 0; joint_num < mesh->mJointRenderData.size(); joint_num++)
+		{
+			LLVector4a trans;
+			trans.load3( mesh->mJointRenderData[joint_num]->mWorldMatrix->getTranslation().mV);
+			update_min_max(newMin, newMax, trans);
+		}
+	}
 
     }
 
@@ -1444,25 +1445,25 @@ void LLVOAvatar::calculateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax)
     {
         float max_attachment_span = get_default_max_prim_scale() * 5.0f;
 	
-        for (attachment_map_t::iterator iter = mAttachmentPoints.begin(); 
-             iter != mAttachmentPoints.end();
-             ++iter)
-        {
-            LLViewerJointAttachment* attachment = iter->second;
+	for (attachment_map_t::iterator iter = mAttachmentPoints.begin(); 
+		 iter != mAttachmentPoints.end();
+		 ++iter)
+	{
+		LLViewerJointAttachment* attachment = iter->second;
 
-            // <FS:Ansariel> Possible crash fix
-            //if (attachment->getValid())
-            if (attachment && attachment->getValid())
-            // </FS:Ansariel>
-            {
-                for (LLViewerJointAttachment::attachedobjs_vec_t::iterator attachment_iter = attachment->mAttachedObjects.begin();
-                     attachment_iter != attachment->mAttachedObjects.end();
-                     ++attachment_iter)
-                {
+		// <FS:Ansariel> Possible crash fix
+		//if (attachment->getValid())
+		if (attachment && attachment->getValid())
+		// </FS:Ansariel>
+		{
+			for (LLViewerJointAttachment::attachedobjs_vec_t::iterator attachment_iter = attachment->mAttachedObjects.begin();
+				 attachment_iter != attachment->mAttachedObjects.end();
+				 ++attachment_iter)
+			{
                     // Don't we need to look at children of attached_object as well?
-                    const LLViewerObject* attached_object = (*attachment_iter);
-                    if (attached_object && !attached_object->isHUDAttachment())
-                    {
+				const LLViewerObject* attached_object = (*attachment_iter);
+				if (attached_object && !attached_object->isHUDAttachment())
+				{
                         const LLVOVolume *vol = dynamic_cast<const LLVOVolume*>(attached_object);
                         if (vol && vol->isAnimatedObject())
                         {
@@ -1484,33 +1485,33 @@ void LLVOAvatar::calculateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax)
                         {
                             continue;
                         }
-                        LLDrawable* drawable = attached_object->mDrawable;
-                        if (drawable && !drawable->isState(LLDrawable::RIGGED))
-                        {
-                            LLSpatialBridge* bridge = drawable->getSpatialBridge();
-                            if (bridge)
-                            {
-                                const LLVector4a* ext = bridge->getSpatialExtents();
-                                LLVector4a distance;
-                                distance.setSub(ext[1], ext[0]);
-                                LLVector4a max_span(max_attachment_span);
+					LLDrawable* drawable = attached_object->mDrawable;
+					if (drawable && !drawable->isState(LLDrawable::RIGGED))
+					{
+						LLSpatialBridge* bridge = drawable->getSpatialBridge();
+						if (bridge)
+						{
+							const LLVector4a* ext = bridge->getSpatialExtents();
+							LLVector4a distance;
+							distance.setSub(ext[1], ext[0]);
+							LLVector4a max_span(max_attachment_span);
 
-                                S32 lt = distance.lessThan(max_span).getGatheredBits() & 0x7;
+							S32 lt = distance.lessThan(max_span).getGatheredBits() & 0x7;
 						
-                                // Only add the prim to spatial extents calculations if it isn't a megaprim.
-                                // max_attachment_span calculated at the start of the function 
-                                // (currently 5 times our max prim size) 
-                                if (lt == 0x7)
-                                {
-                                    update_min_max(newMin,newMax,ext[0]);
-                                    update_min_max(newMin,newMax,ext[1]);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
+							// Only add the prim to spatial extents calculations if it isn't a megaprim.
+							// max_attachment_span calculated at the start of the function 
+							// (currently 5 times our max prim size) 
+							if (lt == 0x7)
+							{
+								update_min_max(newMin,newMax,ext[0]);
+								update_min_max(newMin,newMax,ext[1]);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
     }
 
     // Stretch bounding box by rigged mesh joint boxes
@@ -2048,7 +2049,7 @@ void LLVOAvatar::buildCharacter()
     // Currently disabled for control avatars (animated objects), enabled for all others.
     if (mEnableDefaultMotions)
     {
-        startDefaultMotions();
+	startDefaultMotions();
     }
 
 	//-------------------------------------------------------------------------
@@ -2165,8 +2166,8 @@ void LLVOAvatar::resetSkeleton(bool reset_animations)
     // Reset tweakable params to preserved state
     if (mLastProcessedAppearance)
     {
-        bool slam_params = true;
-        applyParsedAppearanceMessage(*mLastProcessedAppearance, slam_params);
+    bool slam_params = true;
+    applyParsedAppearanceMessage(*mLastProcessedAppearance, slam_params);
     }
     updateVisualParams();
 
@@ -2224,15 +2225,15 @@ void LLVOAvatar::releaseMeshData()
 		LLFace* facep = mDrawable->getFace(0);
 		if (facep)
 		{
-            facep->setSize(0, 0);
-            for(S32 i = mNumInitFaces ; i < mDrawable->getNumFaces(); i++)
-            {
-                facep = mDrawable->getFace(i);
+		facep->setSize(0, 0);
+		for(S32 i = mNumInitFaces ; i < mDrawable->getNumFaces(); i++)
+		{
+			facep = mDrawable->getFace(i);
 				if (facep)
 				{
-                    facep->setSize(0, 0);
-                }
-            }
+			facep->setSize(0, 0);
+		}
+	}
 		}
 	}
 	
@@ -2932,13 +2933,13 @@ void LLVOAvatar::idleUpdateMisc(bool detailed_update)
 
     if (mDrawable.notNull())
     {
-        mDrawable->movePartition();
-        
-        //force a move if sitting on an active object
-        if (getParent() && ((LLViewerObject*) getParent())->mDrawable->isActive())
-        {
-            gPipeline.markMoved(mDrawable, TRUE);
-        }
+	mDrawable->movePartition();
+	
+	//force a move if sitting on an active object
+	if (getParent() && ((LLViewerObject*) getParent())->mDrawable->isActive())
+	{
+		gPipeline.markMoved(mDrawable, TRUE);
+	}
     }
 }
 
@@ -4110,74 +4111,74 @@ bool LLVOAvatar::isRlvSilhouette()
 
 void LLVOAvatar::updateAppearanceMessageDebugText()
 {
-    S32 central_bake_version = -1;
-    if (getRegion())
-    {
-        central_bake_version = getRegion()->getCentralBakeVersion();
-    }
-    bool all_baked_downloaded = allBakedTexturesCompletelyDownloaded();
-    bool all_local_downloaded = allLocalTexturesCompletelyDownloaded();
-    std::string debug_line = llformat("%s%s - mLocal: %d, mEdit: %d, mUSB: %d, CBV: %d",
-                                      isSelf() ? (all_local_downloaded ? "L" : "l") : "-",
-                                      all_baked_downloaded ? "B" : "b",
-                                      mUseLocalAppearance, mIsEditingAppearance,
-                                      // <FS:Ansariel> [Legacy Bake]
-                                      //1, central_bake_version);
-                                      mUseServerBakes, central_bake_version);
-                                      // </FS:Ansariel> [Legacy Bake]
-    std::string origin_string = bakedTextureOriginInfo();
-    debug_line += " [" + origin_string + "]";
-    S32 curr_cof_version = LLAppearanceMgr::instance().getCOFVersion();
-    S32 last_request_cof_version = mLastUpdateRequestCOFVersion;
-    S32 last_received_cof_version = mLastUpdateReceivedCOFVersion;
-    if (isSelf())
-    {
-        debug_line += llformat(" - cof: %d req: %d rcv:%d",
-                               curr_cof_version, last_request_cof_version, last_received_cof_version);
-        // <FS:CR> Use LLCachedControl
-        //if (gSavedSettings.getBOOL("DebugForceAppearanceRequestFailure"))
-        static LLCachedControl<bool> debug_force_appearance_request_failure(gSavedSettings, "DebugForceAppearanceRequestFailure");
-        if (debug_force_appearance_request_failure)
-        // </FS:CR>
+		S32 central_bake_version = -1;
+		if (getRegion())
+		{
+			central_bake_version = getRegion()->getCentralBakeVersion();
+		}
+		bool all_baked_downloaded = allBakedTexturesCompletelyDownloaded();
+		bool all_local_downloaded = allLocalTexturesCompletelyDownloaded();
+		std::string debug_line = llformat("%s%s - mLocal: %d, mEdit: %d, mUSB: %d, CBV: %d",
+										  isSelf() ? (all_local_downloaded ? "L" : "l") : "-",
+										  all_baked_downloaded ? "B" : "b",
+										  mUseLocalAppearance, mIsEditingAppearance,
+										  // <FS:Ansariel> [Legacy Bake]
+										  //1, central_bake_version);
+										  mUseServerBakes, central_bake_version);
+										  // </FS:Ansariel> [Legacy Bake]
+		std::string origin_string = bakedTextureOriginInfo();
+		debug_line += " [" + origin_string + "]";
+		S32 curr_cof_version = LLAppearanceMgr::instance().getCOFVersion();
+		S32 last_request_cof_version = mLastUpdateRequestCOFVersion;
+		S32 last_received_cof_version = mLastUpdateReceivedCOFVersion;
+		if (isSelf())
+		{
+			debug_line += llformat(" - cof: %d req: %d rcv:%d",
+								   curr_cof_version, last_request_cof_version, last_received_cof_version);
+			// <FS:CR> Use LLCachedControl
+			//if (gSavedSettings.getBOOL("DebugForceAppearanceRequestFailure"))
+			static LLCachedControl<bool> debug_force_appearance_request_failure(gSavedSettings, "DebugForceAppearanceRequestFailure");
+			if (debug_force_appearance_request_failure)
+			// </FS:CR>
+			{
+				debug_line += " FORCING ERRS";
+			}
+		}
+		else
+		{
+			debug_line += llformat(" - cof rcv:%d", last_received_cof_version);
+		}
+		debug_line += llformat(" bsz-z: %.3f", mBodySize[2]);
+        if (mAvatarOffset[2] != 0.0f)
         {
-            debug_line += " FORCING ERRS";
+            debug_line += llformat("avofs-z: %.3f", mAvatarOffset[2]);
         }
-    }
-    else
-    {
-        debug_line += llformat(" - cof rcv:%d", last_received_cof_version);
-    }
-    debug_line += llformat(" bsz-z: %.3f", mBodySize[2]);
-    if (mAvatarOffset[2] != 0.0f)
-    {
-        debug_line += llformat("avofs-z: %.3f", mAvatarOffset[2]);
-    }
-    bool hover_enabled = getRegion() && getRegion()->avatarHoverHeightEnabled();
-    debug_line += hover_enabled ? " H" : " h";
-    const LLVector3& hover_offset = getHoverOffset();
-    if (hover_offset[2] != 0.0)
-    {
-        debug_line += llformat(" hov_z: %.3f", hover_offset[2]);
+		bool hover_enabled = getRegion() && getRegion()->avatarHoverHeightEnabled();
+		debug_line += hover_enabled ? " H" : " h";
+		const LLVector3& hover_offset = getHoverOffset();
+		if (hover_offset[2] != 0.0)
+		{
+			debug_line += llformat(" hov_z: %.3f", hover_offset[2]);
         debug_line += llformat(" %s", (isSitting() ? "S" : "T"));
-        debug_line += llformat("%s", (isMotionActive(ANIM_AGENT_SIT_GROUND_CONSTRAINED) ? "G" : "-"));
-    }
+			debug_line += llformat("%s", (isMotionActive(ANIM_AGENT_SIT_GROUND_CONSTRAINED) ? "G" : "-"));
+		}
 
-    LLVector3 ankle_right_pos_agent = mFootRightp->getWorldPosition();
-    LLVector3 normal;
-    LLVector3 ankle_right_ground_agent = ankle_right_pos_agent;
-    resolveHeightAgent(ankle_right_pos_agent, ankle_right_ground_agent, normal);
-    F32 rightElev = llmax(-0.2f, ankle_right_pos_agent.mV[VZ] - ankle_right_ground_agent.mV[VZ]);
-    debug_line += llformat(" relev %.3f", rightElev);
+        LLVector3 ankle_right_pos_agent = mFootRightp->getWorldPosition();
+		LLVector3 normal;
+        LLVector3 ankle_right_ground_agent = ankle_right_pos_agent;
+        resolveHeightAgent(ankle_right_pos_agent, ankle_right_ground_agent, normal);
+        F32 rightElev = llmax(-0.2f, ankle_right_pos_agent.mV[VZ] - ankle_right_ground_agent.mV[VZ]);
+        debug_line += llformat(" relev %.3f", rightElev);
 
-    LLVector3 root_pos = mRoot->getPosition();
-    LLVector3 pelvis_pos = mPelvisp->getPosition();
-    debug_line += llformat(" rp %.3f pp %.3f", root_pos[2], pelvis_pos[2]);
+        LLVector3 root_pos = mRoot->getPosition();
+        LLVector3 pelvis_pos = mPelvisp->getPosition();
+        debug_line += llformat(" rp %.3f pp %.3f", root_pos[2], pelvis_pos[2]);
 
     S32 is_visible = (S32) isVisible();
     S32 is_m_visible = (S32) mVisible;
     debug_line += llformat(" v %d/%d", is_visible, is_m_visible);
 
-    addDebugText(debug_line);
+		addDebugText(debug_line);
 }
 
 LLViewerInventoryItem* getObjectInventoryItem(LLViewerObject *vobj, LLUUID asset_id)
@@ -4189,7 +4190,7 @@ LLViewerInventoryItem* getObjectInventoryItem(LLViewerObject *vobj, LLUUID asset
         if (vobj->getInventorySerial()<=0)
         {
             vobj->requestInventory(); 
-        }
+	}
         item = vobj->getInventoryItemByAsset(asset_id);
     }
     return item;
@@ -4207,23 +4208,23 @@ LLViewerInventoryItem* recursiveGetObjectInventoryItem(LLViewerObject *vobj, LLU
             LLViewerObject *childp = *it;
             item = getObjectInventoryItem(childp, asset_id);
             if (item)
-            {
+	{
                 break;
             }
         }
-    }
+	}
     return item;
 }
 
 void LLVOAvatar::updateAnimationDebugText()
 {
-    for (LLMotionController::motion_list_t::iterator iter = mMotionController.getActiveMotions().begin();
-         iter != mMotionController.getActiveMotions().end(); ++iter)
-    {
-        LLMotion* motionp = *iter;
-        if (motionp->getMinPixelArea() < getPixelArea())
-        {
-            std::string output;
+		for (LLMotionController::motion_list_t::iterator iter = mMotionController.getActiveMotions().begin();
+			 iter != mMotionController.getActiveMotions().end(); ++iter)
+		{
+			LLMotion* motionp = *iter;
+			if (motionp->getMinPixelArea() < getPixelArea())
+			{
+				std::string output;
             std::string motion_name = motionp->getName();
             if (motion_name.empty())
             {
@@ -4240,73 +4241,73 @@ void LLVOAvatar::updateAnimationDebugText()
                 }
             }
             if (motion_name.empty())
-            {
-                std::string name;
-                if (gAgent.isGodlikeWithoutAdminMenuFakery() || isSelf())
-                {
-                    name = motionp->getID().asString();
-                    LLVOAvatar::AnimSourceIterator anim_it = mAnimationSources.begin();
-                    for (; anim_it != mAnimationSources.end(); ++anim_it)
-                    {
-                        if (anim_it->second == motionp->getID())
-                        {
-                            LLViewerObject* object = gObjectList.findObject(anim_it->first);
-                            if (!object)
-                            {
-                                break;
-                            }
-                            if (object->isAvatar())
-                            {
-                                if (mMotionController.mIsSelf)
-                                {
-                                    // Searching inventory by asset id is really long
-                                    // so just mark as inventory
-                                    // Also item is likely to be named by LLPreviewAnim
-                                    name += "(inventory)";
-                                }
-                            }
-                            else
-                            {
-                                LLViewerInventoryItem* item = NULL;
-                                if (!object->isInventoryDirty())
-                                {
-                                    item = object->getInventoryItemByAsset(motionp->getID());
-                                }
-                                if (item)
-                                {
-                                    name = item->getName();
-                                }
-                                else if (object->isAttachment())
-                                {
-                                    name += "(" + getAttachmentItemName() + ")";
-                                }
-                                else
-                                {
-                                    // in-world object, name or content unknown
-                                    name += "(in-world)";
-                                }
-                            }
-                            break;
-                        }
-                    }
-                }
-                else
-                {
-                    name = LLUUID::null.asString();
-                }
-                output = llformat("%s - %d",
-                                  name.c_str(),
-                                  (U32)motionp->getPriority());
-            }
-            else
-            {
-                output = llformat("%s - %d",
+				{
+					std::string name;
+					if (gAgent.isGodlikeWithoutAdminMenuFakery() || isSelf())
+					{
+						name = motionp->getID().asString();
+						LLVOAvatar::AnimSourceIterator anim_it = mAnimationSources.begin();
+						for (; anim_it != mAnimationSources.end(); ++anim_it)
+						{
+							if (anim_it->second == motionp->getID())
+							{
+								LLViewerObject* object = gObjectList.findObject(anim_it->first);
+								if (!object)
+								{
+									break;
+								}
+								if (object->isAvatar())
+								{
+									if (mMotionController.mIsSelf)
+									{
+										// Searching inventory by asset id is really long
+										// so just mark as inventory
+										// Also item is likely to be named by LLPreviewAnim
+										name += "(inventory)";
+									}
+								}
+								else
+								{
+									LLViewerInventoryItem* item = NULL;
+									if (!object->isInventoryDirty())
+									{
+										item = object->getInventoryItemByAsset(motionp->getID());
+									}
+									if (item)
+									{
+										name = item->getName();
+									}
+									else if (object->isAttachment())
+									{
+										name += "(" + getAttachmentItemName() + ")";
+									}
+									else
+									{
+										// in-world object, name or content unknown
+										name += "(in-world)";
+									}
+								}
+								break;
+							}
+						}
+					}
+					else
+					{
+						name = LLUUID::null.asString();
+					}
+					output = llformat("%s - %d",
+							  name.c_str(),
+							  (U32)motionp->getPriority());
+				}
+				else
+				{
+					output = llformat("%s - %d",
                                   motion_name.c_str(),
-                                  (U32)motionp->getPriority());
-            }
-            addDebugText(output);
-        }
-    }
+							  (U32)motionp->getPriority());
+				}
+				addDebugText(output);
+			}
+		}
 }
 
 void LLVOAvatar::updateDebugText()
@@ -4347,7 +4348,7 @@ void LLVOAvatar::updateDebugText()
 	{
 		setDebugText(mDebugText);
 	}
-    mDebugText.clear();
+	mDebugText.clear();
 }
 
 //------------------------------------------------------------------------
@@ -4361,7 +4362,7 @@ void LLVOAvatar::updateFootstepSounds()
     {
         return;
     }
-    
+	
 	//-------------------------------------------------------------------------
 	// Find the ground under each foot, these are used for a variety
 	// of things that follow
@@ -4386,7 +4387,7 @@ void LLVOAvatar::updateFootstepSounds()
 		if (!mInAir)
 		{
 			if ((leftElev < 0.0f) || (rightElev < 0.0f))
-			{
+	{
 				ankle_left_pos_agent = mFootLeftp->getWorldPosition();
 				ankle_right_pos_agent = mFootRightp->getWorldPosition();
 				leftElev = ankle_left_pos_agent.mV[VZ] - ankle_left_ground_agent.mV[VZ];
@@ -4415,10 +4416,10 @@ void LLVOAvatar::updateFootstepSounds()
 
 		// did right foot hit the ground?
 		if ( onGroundRight && !mWasOnGroundRight )
-		{
+	{
 			foot_pos_agent = ankle_right_pos_agent;
 			playSound = TRUE;
-		}
+	}
 
 		mWasOnGroundLeft = onGroundLeft;
 		mWasOnGroundRight = onGroundRight;
@@ -4503,6 +4504,7 @@ void LLVOAvatar::computeUpdatePeriod()
 	}
 
 }
+
 //------------------------------------------------------------------------
 // updateOrientation()
 // Factored out from updateCharacter()
@@ -4513,157 +4515,157 @@ void LLVOAvatar::computeUpdatePeriod()
 //------------------------------------------------------------------------
 void LLVOAvatar::updateOrientation(LLAgent& agent, F32 speed, F32 delta_time)
 {
-    LLQuaternion iQ;
-    LLVector3 upDir( 0.0f, 0.0f, 1.0f );
-			
-    // Compute a forward direction vector derived from the primitive rotation
-    // and the velocity vector.  When walking or jumping, don't let body deviate
-    // more than 90 from the view, if necessary, flip the velocity vector.
-
-    LLVector3 primDir;
-    if (isSelf())
-    {
-        primDir = agent.getAtAxis() - projected_vec(agent.getAtAxis(), agent.getReferenceUpVector());
-        primDir.normalize();
-    }
-    else
-    {
-        primDir = getRotation().getMatrix3().getFwdRow();
-    }
-    LLVector3 velDir = getVelocity();
-    velDir.normalize();
-    // <FS> Disable avatar turning towards camera when walking backwards
-    //if ( mSignaledAnimations.find(ANIM_AGENT_WALK) != mSignaledAnimations.end())
-    static LLCachedControl<bool> walk_backwards(gSavedSettings, "FSDisableTurningAroundWhenWalkingBackwards");
-    if (walk_backwards && mSignaledAnimations.find(ANIM_AGENT_WALK) != mSignaledAnimations.end())
-    // </FS>
-    {
-        F32 vpD = velDir * primDir;
-        if (vpD < -0.5f)
-        {
-            velDir *= -1.0f;
-        }
-    }
-    LLVector3 fwdDir = lerp(primDir, velDir, clamp_rescale(speed, 0.5f, 2.0f, 0.0f, 1.0f));
-    if (isSelf() && gAgentCamera.cameraMouselook())
-    {
-        // make sure fwdDir stays in same general direction as primdir
-        if (gAgent.getFlying())
-        {
-            fwdDir = LLViewerCamera::getInstance()->getAtAxis();
-        }
-        else
-        {
-            LLVector3 at_axis = LLViewerCamera::getInstance()->getAtAxis();
-            LLVector3 up_vector = gAgent.getReferenceUpVector();
-            at_axis -= up_vector * (at_axis * up_vector);
-            at_axis.normalize();
+			LLQuaternion iQ;
+			LLVector3 upDir( 0.0f, 0.0f, 1.0f );
 					
-            F32 dot = fwdDir * at_axis;
-            if (dot < 0.f)
-            {
-                fwdDir -= 2.f * at_axis * dot;
-                fwdDir.normalize();
-            }
-        }
-    }
+			// Compute a forward direction vector derived from the primitive rotation
+			// and the velocity vector.  When walking or jumping, don't let body deviate
+			// more than 90 from the view, if necessary, flip the velocity vector.
 
-    LLQuaternion root_rotation = mRoot->getWorldMatrix().quaternion();
-    F32 root_roll, root_pitch, root_yaw;
-    root_rotation.getEulerAngles(&root_roll, &root_pitch, &root_yaw);
+			LLVector3 primDir;
+			if (isSelf())
+			{
+				primDir = agent.getAtAxis() - projected_vec(agent.getAtAxis(), agent.getReferenceUpVector());
+				primDir.normalize();
+			}
+			else
+			{
+				primDir = getRotation().getMatrix3().getFwdRow();
+			}
+			LLVector3 velDir = getVelocity();
+			velDir.normalize();
+			// <FS> Disable avatar turning towards camera when walking backwards
+			//if ( mSignaledAnimations.find(ANIM_AGENT_WALK) != mSignaledAnimations.end())
+			static LLCachedControl<bool> walk_backwards(gSavedSettings, "FSDisableTurningAroundWhenWalkingBackwards");
+			if (walk_backwards && mSignaledAnimations.find(ANIM_AGENT_WALK) != mSignaledAnimations.end())
+			// </FS>
+			{
+				F32 vpD = velDir * primDir;
+				if (vpD < -0.5f)
+				{
+					velDir *= -1.0f;
+				}
+			}
+			LLVector3 fwdDir = lerp(primDir, velDir, clamp_rescale(speed, 0.5f, 2.0f, 0.0f, 1.0f));
+			if (isSelf() && gAgentCamera.cameraMouselook())
+			{
+				// make sure fwdDir stays in same general direction as primdir
+				if (gAgent.getFlying())
+				{
+					fwdDir = LLViewerCamera::getInstance()->getAtAxis();
+				}
+				else
+				{
+					LLVector3 at_axis = LLViewerCamera::getInstance()->getAtAxis();
+					LLVector3 up_vector = gAgent.getReferenceUpVector();
+					at_axis -= up_vector * (at_axis * up_vector);
+					at_axis.normalize();
+					
+					F32 dot = fwdDir * at_axis;
+					if (dot < 0.f)
+					{
+						fwdDir -= 2.f * at_axis * dot;
+						fwdDir.normalize();
+					}
+				}
+			}
 
-    // When moving very slow, the pelvis is allowed to deviate from the
+			LLQuaternion root_rotation = mRoot->getWorldMatrix().quaternion();
+			F32 root_roll, root_pitch, root_yaw;
+			root_rotation.getEulerAngles(&root_roll, &root_pitch, &root_yaw);
+
+			// When moving very slow, the pelvis is allowed to deviate from the
     // forward direction to allow it to hold its position while the torso
-    // and head turn.  Once in motion, it must conform however.
-    BOOL self_in_mouselook = isSelf() && gAgentCamera.cameraMouselook();
+			// and head turn.  Once in motion, it must conform however.
+			BOOL self_in_mouselook = isSelf() && gAgentCamera.cameraMouselook();
 
-    LLVector3 pelvisDir( mRoot->getWorldMatrix().getFwdRow4().mV );
+			LLVector3 pelvisDir( mRoot->getWorldMatrix().getFwdRow4().mV );
 
-    static LLCachedControl<F32> s_pelvis_rot_threshold_slow(gSavedSettings, "AvatarRotateThresholdSlow", 60.0);
-    static LLCachedControl<F32> s_pelvis_rot_threshold_fast(gSavedSettings, "AvatarRotateThresholdFast", 2.0);
+			static LLCachedControl<F32> s_pelvis_rot_threshold_slow(gSavedSettings, "AvatarRotateThresholdSlow", 60.0);
+			static LLCachedControl<F32> s_pelvis_rot_threshold_fast(gSavedSettings, "AvatarRotateThresholdFast", 2.0);
 
-    F32 pelvis_rot_threshold = clamp_rescale(speed, 0.1f, 1.0f, s_pelvis_rot_threshold_slow, s_pelvis_rot_threshold_fast);
+			F32 pelvis_rot_threshold = clamp_rescale(speed, 0.1f, 1.0f, s_pelvis_rot_threshold_slow, s_pelvis_rot_threshold_fast);
 						
-    if (self_in_mouselook)
-    {
-        pelvis_rot_threshold *= MOUSELOOK_PELVIS_FOLLOW_FACTOR;
-    }
-    pelvis_rot_threshold *= DEG_TO_RAD;
+			if (self_in_mouselook)
+			{
+				pelvis_rot_threshold *= MOUSELOOK_PELVIS_FOLLOW_FACTOR;
+			}
+			pelvis_rot_threshold *= DEG_TO_RAD;
 
-    F32 angle = angle_between( pelvisDir, fwdDir );
+			F32 angle = angle_between( pelvisDir, fwdDir );
 
-    // The avatar's root is allowed to have a yaw that deviates widely
-    // from the forward direction, but if roll or pitch are off even
-    // a little bit we need to correct the rotation.
-    if(root_roll < 1.f * DEG_TO_RAD
-       && root_pitch < 5.f * DEG_TO_RAD)
-    {
-        // smaller correction vector means pelvis follows prim direction more closely
-        if (!mTurning && angle > pelvis_rot_threshold*0.75f)
-        {
-            mTurning = TRUE;
-        }
+			// The avatar's root is allowed to have a yaw that deviates widely
+			// from the forward direction, but if roll or pitch are off even
+			// a little bit we need to correct the rotation.
+			if(root_roll < 1.f * DEG_TO_RAD
+			   && root_pitch < 5.f * DEG_TO_RAD)
+			{
+				// smaller correction vector means pelvis follows prim direction more closely
+				if (!mTurning && angle > pelvis_rot_threshold*0.75f)
+				{
+					mTurning = TRUE;
+				}
 
-        // use tighter threshold when turning
-        if (mTurning)
-        {
-            pelvis_rot_threshold *= 0.4f;
-        }
+				// use tighter threshold when turning
+				if (mTurning)
+				{
+					pelvis_rot_threshold *= 0.4f;
+				}
 
-        // am I done turning?
-        if (angle < pelvis_rot_threshold)
-        {
-            mTurning = FALSE;
-        }
+				// am I done turning?
+				if (angle < pelvis_rot_threshold)
+				{
+					mTurning = FALSE;
+				}
 
-        LLVector3 correction_vector = (pelvisDir - fwdDir) * clamp_rescale(angle, pelvis_rot_threshold*0.75f, pelvis_rot_threshold, 1.0f, 0.0f);
-        fwdDir += correction_vector;
-    }
-    else
-    {
-        mTurning = FALSE;
-    }
+				LLVector3 correction_vector = (pelvisDir - fwdDir) * clamp_rescale(angle, pelvis_rot_threshold*0.75f, pelvis_rot_threshold, 1.0f, 0.0f);
+				fwdDir += correction_vector;
+			}
+			else
+			{
+				mTurning = FALSE;
+			}
 
-    // Now compute the full world space rotation for the whole body (wQv)
-    LLVector3 leftDir = upDir % fwdDir;
-    leftDir.normalize();
-    fwdDir = leftDir % upDir;
-    LLQuaternion wQv( fwdDir, leftDir, upDir );
+			// Now compute the full world space rotation for the whole body (wQv)
+			LLVector3 leftDir = upDir % fwdDir;
+			leftDir.normalize();
+			fwdDir = leftDir % upDir;
+			LLQuaternion wQv( fwdDir, leftDir, upDir );
 
-    if (isSelf() && mTurning)
-    {
-        if ((fwdDir % pelvisDir) * upDir > 0.f)
-        {
-            gAgent.setControlFlags(AGENT_CONTROL_TURN_RIGHT);
-        }
-        else
-        {
-            gAgent.setControlFlags(AGENT_CONTROL_TURN_LEFT);
-        }
-    }
+			if (isSelf() && mTurning)
+			{
+				if ((fwdDir % pelvisDir) * upDir > 0.f)
+				{
+					gAgent.setControlFlags(AGENT_CONTROL_TURN_RIGHT);
+				}
+				else
+				{
+					gAgent.setControlFlags(AGENT_CONTROL_TURN_LEFT);
+				}
+			}
 
-    // Set the root rotation, but do so incrementally so that it
-    // lags in time by some fixed amount.
-    //F32 u = LLSmoothInterpolation::getInterpolant(PELVIS_LAG);
-    F32 pelvis_lag_time = 0.f;
-    if (self_in_mouselook)
-    {
-        pelvis_lag_time = PELVIS_LAG_MOUSELOOK;
-    }
-    else if (mInAir)
-    {
-        pelvis_lag_time = PELVIS_LAG_FLYING;
-        // increase pelvis lag time when moving slowly
-        pelvis_lag_time *= clamp_rescale(mSpeedAccum, 0.f, 15.f, 3.f, 1.f);
-    }
-    else
-    {
-        pelvis_lag_time = PELVIS_LAG_WALKING;
-    }
+			// Set the root rotation, but do so incrementally so that it
+			// lags in time by some fixed amount.
+			//F32 u = LLSmoothInterpolation::getInterpolant(PELVIS_LAG);
+			F32 pelvis_lag_time = 0.f;
+			if (self_in_mouselook)
+			{
+				pelvis_lag_time = PELVIS_LAG_MOUSELOOK;
+			}
+			else if (mInAir)
+			{
+				pelvis_lag_time = PELVIS_LAG_FLYING;
+				// increase pelvis lag time when moving slowly
+				pelvis_lag_time *= clamp_rescale(mSpeedAccum, 0.f, 15.f, 3.f, 1.f);
+			}
+			else
+			{
+				pelvis_lag_time = PELVIS_LAG_WALKING;
+			}
 
     F32 u = llclamp((delta_time / pelvis_lag_time), 0.0f, 1.0f);	
 
-    mRoot->setWorldRotation( slerp(u, mRoot->getWorldRotation(), wQv) );
+			mRoot->setWorldRotation( slerp(u, mRoot->getWorldRotation(), wQv) );
 }
 
 //------------------------------------------------------------------------
@@ -4737,7 +4739,7 @@ void LLVOAvatar::updateRootPositionAndRotation(LLAgent& agent, F32 speed, bool w
 			mRoot->setWorldPosition( getPositionAgent() ); // first frame
 			mRoot->setWorldRotation( getRotation() );
 		}
-	
+			
 		//--------------------------------------------------------------------
 		// dont' let dT get larger than 1/5th of a second
 		//--------------------------------------------------------------------
@@ -4988,7 +4990,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
 	mRoot->updateWorldMatrixChildren();
 
 	// System avatar mesh vertices need to be reskinned.
-    mNeedsSkin = TRUE;
+	mNeedsSkin = TRUE;
 
 	return TRUE;
 }
@@ -5509,14 +5511,14 @@ U32 LLVOAvatar::renderTransparent(BOOL first_pass)
 			first_pass = FALSE;
 		}
 		if (isTextureVisible(TEX_HAIR_BAKED))
-        {
-            LLViewerJoint* hair_mesh = getViewerJoint(MESH_ID_HAIR);
-            if (hair_mesh)
-            {
-                num_indices += hair_mesh->render(mAdjustedPixelArea, first_pass, mIsDummy);
-            }
-            first_pass = FALSE;
-        }
+		{
+			LLViewerJoint* hair_mesh = getViewerJoint(MESH_ID_HAIR);
+			if (hair_mesh)
+			{
+				num_indices += hair_mesh->render(mAdjustedPixelArea, first_pass, mIsDummy);
+			}
+			first_pass = FALSE;
+		}
 		if (LLPipeline::sImpostorRender)
 		{
 			gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
@@ -5624,41 +5626,41 @@ U32 LLVOAvatar::renderImpostor(LLColor4U color, S32 diffuse_channel)
 		gGL.flush();
 	}
 	{
-		LLGLEnable test(GL_ALPHA_TEST);
-		gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.f);
+	LLGLEnable test(GL_ALPHA_TEST);
+	gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.f);
 
-		gGL.color4ubv(color.mV);
-		gGL.getTexUnit(diffuse_channel)->bind(&mImpostor);
-		// <FS:Ansariel> Remove QUADS rendering mode
-		//gGL.begin(LLRender::QUADS);
-		//gGL.texCoord2f(0,0);
-		//gGL.vertex3fv((pos+left-up).mV);
-		//gGL.texCoord2f(1,0);
-		//gGL.vertex3fv((pos-left-up).mV);
-		//gGL.texCoord2f(1,1);
-		//gGL.vertex3fv((pos-left+up).mV);
-		//gGL.texCoord2f(0,1);
-		//gGL.vertex3fv((pos+left+up).mV);
-		//gGL.end();
-		gGL.begin(LLRender::TRIANGLES);
-		{
-			gGL.texCoord2f(0.f, 0.f);
-			gGL.vertex3fv((pos + left - up).mV);
-			gGL.texCoord2f(1.f, 0.f);
-			gGL.vertex3fv((pos - left - up).mV);
-			gGL.texCoord2f(1.f, 1.f);
-			gGL.vertex3fv((pos - left + up).mV);
+	gGL.color4ubv(color.mV);
+	gGL.getTexUnit(diffuse_channel)->bind(&mImpostor);
+	// <FS:Ansariel> Remove QUADS rendering mode
+	//gGL.begin(LLRender::QUADS);
+	//gGL.texCoord2f(0,0);
+	//gGL.vertex3fv((pos+left-up).mV);
+	//gGL.texCoord2f(1,0);
+	//gGL.vertex3fv((pos-left-up).mV);
+	//gGL.texCoord2f(1,1);
+	//gGL.vertex3fv((pos-left+up).mV);
+	//gGL.texCoord2f(0,1);
+	//gGL.vertex3fv((pos+left+up).mV);
+	//gGL.end();
+	gGL.begin(LLRender::TRIANGLES);
+	{
+		gGL.texCoord2f(0.f, 0.f);
+		gGL.vertex3fv((pos + left - up).mV);
+		gGL.texCoord2f(1.f, 0.f);
+		gGL.vertex3fv((pos - left - up).mV);
+		gGL.texCoord2f(1.f, 1.f);
+		gGL.vertex3fv((pos - left + up).mV);
 
-			gGL.texCoord2f(0.f, 0.f);
-			gGL.vertex3fv((pos + left - up).mV);
-			gGL.texCoord2f(1.f, 1.f);
-			gGL.vertex3fv((pos - left + up).mV);
-			gGL.texCoord2f(0.f, 1.f);
-			gGL.vertex3fv((pos + left + up).mV);
-		}
-		gGL.end();
-		// </FS:Ansariel>
-		gGL.flush();
+		gGL.texCoord2f(0.f, 0.f);
+		gGL.vertex3fv((pos + left - up).mV);
+		gGL.texCoord2f(1.f, 1.f);
+		gGL.vertex3fv((pos - left + up).mV);
+		gGL.texCoord2f(0.f, 1.f);
+		gGL.vertex3fv((pos + left + up).mV);
+	}
+	gGL.end();
+	// </FS:Ansariel>
+	gGL.flush();
 	}
 
 	return 6;
@@ -6184,8 +6186,8 @@ void LLVOAvatar::processAnimationStateChanges()
 		stopMotion(ANIM_AGENT_WALK_ADJUST);
         if (mEnableDefaultMotions)
         {
-            startMotion(ANIM_AGENT_FLY_ADJUST);
-        }
+		startMotion(ANIM_AGENT_FLY_ADJUST);
+	}
 	}
 	else
 	{
@@ -6197,7 +6199,7 @@ void LLVOAvatar::processAnimationStateChanges()
 	{
         if (mEnableDefaultMotions)
         {
-            startMotion(ANIM_AGENT_TARGET);
+		startMotion(ANIM_AGENT_TARGET);
         }
 		stopMotion(ANIM_AGENT_BODY_NOISE);
 	}
@@ -6206,8 +6208,8 @@ void LLVOAvatar::processAnimationStateChanges()
 		stopMotion(ANIM_AGENT_TARGET);
         if (mEnableDefaultMotions)
         {
-            startMotion(ANIM_AGENT_BODY_NOISE);
-        }
+		startMotion(ANIM_AGENT_BODY_NOISE);
+	}
 	}
 	
 	// clear all current animations
@@ -6571,7 +6573,7 @@ LLJoint *LLVOAvatar::getJoint( const JointKey &name )
 
 	LLJoint* jointp = NULL;
 
-	if( iter == mJointMap.end() || iter->second == NULL )
+	if (iter == mJointMap.end() || iter->second == NULL)
 	{   //search for joint and cache found joint in lookup table
 		jointp = mRoot->findJoint( name.mName );
 		mJointMap[ name.mKey ] = jointp;
@@ -6640,10 +6642,10 @@ bool LLVOAvatar::getRiggedMeshID(LLViewerObject* pVO, LLUUID& mesh_id)
 			if (pSkinData 
 				&& pSkinData->mJointNames.size() > JOINT_COUNT_REQUIRED_FOR_FULLRIG	// full rig
 				&& pSkinData->mAlternateBindMatrix.size() > 0 )
-            {				
-                mesh_id = pSkinData->mMeshID;
-                return true;
-            }
+					{				
+						mesh_id = pSkinData->mMeshID;
+						return true;
+					}
 		}
 	}
 	return false;
@@ -6652,14 +6654,14 @@ bool LLVOAvatar::getRiggedMeshID(LLViewerObject* pVO, LLUUID& mesh_id)
 bool LLVOAvatar::jointIsRiggedTo(const LLJoint *joint) const
 {
     if (joint)
-    {
+	{
         const LLJointRiggingInfoTab& tab = mJointRiggingInfoTab;
         S32 joint_num = joint->getJointNum();
         if (joint_num < tab.size() && tab[joint_num].isRiggedTo())
-        {
-            return true;
+            {
+                return true;
+            }
         }
-    }
     return false;
 }
 
@@ -6668,25 +6670,25 @@ void LLVOAvatar::clearAttachmentOverrides()
     LLScopedContextString str("clearAttachmentOverrides " + getFullname());
 
     for (S32 i=0; i<LL_CHARACTER_MAX_ANIMATED_JOINTS; i++)
-    {
+	{
         LLJoint *pJoint = getJoint(i);
         if (pJoint)
         {
 			pJoint->clearAttachmentPosOverrides();
 			pJoint->clearAttachmentScaleOverrides();
         }
-    }
+	}
 
     if (mPelvisFixups.count()>0)
     {
         mPelvisFixups.clear();
         LLJoint* pJointPelvis = getJoint("mPelvis");
         if (pJointPelvis)
-        {
+	{
 			pJointPelvis->setPosition( LLVector3( 0.0f, 0.0f, 0.0f) );
         }
         postPelvisSetRecalc();	
-    }
+	}
 
     mActiveOverrideMeshes.clear();
     onActiveOverrideMeshesChanged();
@@ -6707,7 +6709,7 @@ void LLVOAvatar::rebuildAttachmentOverrides()
     // Handle the case that we're resetting the skeleton of an animated object.
     LLControlAvatar *control_av = dynamic_cast<LLControlAvatar*>(this);
     if (control_av)
-    {
+	{
         LLVOVolume *volp = control_av->mRootVolp;
         if (volp)
         {
@@ -6844,9 +6846,9 @@ void LLVOAvatar::updateAttachmentOverrides()
                 if (scale_overrides_by_joint[joint_num] != joint->m_attachmentScaleOverrides)
                 {
                     mismatched = true;
-                }
             }
         }
+    }
         if (pelvis_fixups != mPelvisFixups)
         {
             mismatched = true;
@@ -6865,10 +6867,10 @@ void LLVOAvatar::updateAttachmentOverrides()
 void LLVOAvatar::addAttachmentOverridesForObject(LLViewerObject *vo, std::set<LLUUID>* meshes_seen, bool recursive)
 {
     if (vo->getAvatar() != this && vo->getAvatarAncestor() != this)
-    {
+	{
 		LL_WARNS("Avatar") << "called with invalid avatar" << LL_ENDL;
         return;
-    }
+	}
 
     LLScopedContextString str("addAttachmentOverridesForObject " + getFullname());
     
@@ -6878,14 +6880,14 @@ void LLVOAvatar::addAttachmentOverridesForObject(LLViewerObject *vo, std::set<LL
 	// Process all children
     if (recursive)
     {
-        LLViewerObject::const_child_list_t& children = vo->getChildren();
-        for (LLViewerObject::const_child_list_t::const_iterator it = children.begin();
-             it != children.end(); ++it)
-        {
-            LLViewerObject *childp = *it;
+	LLViewerObject::const_child_list_t& children = vo->getChildren();
+	for (LLViewerObject::const_child_list_t::const_iterator it = children.begin();
+		 it != children.end(); ++it)
+	{
+		LLViewerObject *childp = *it;
             addAttachmentOverridesForObject(childp, meshes_seen, true);
         }
-    }
+	}
 
 	LLVOVolume *vobj = dynamic_cast<LLVOVolume*>(vo);
 	bool pelvisGotSet = false;
@@ -7157,7 +7159,7 @@ void LLVOAvatar::removeAttachmentOverridesForObject(const LLUUID& mesh_id)
 
     const std::string av_string = avString();
     for (S32 joint_num = 0; joint_num < LL_CHARACTER_MAX_ANIMATED_JOINTS; joint_num++)
-    {
+	{
         LLJoint *pJoint = getJoint(joint_num);
 		if ( pJoint )
 		{			
@@ -8029,26 +8031,27 @@ BOOL LLVOAvatar::detachObject(LLViewerObject *viewer_object)
 		if (attachment && attachment->isObjectAttached(viewer_object))
 		// </FS:Ansariel>
 		{
-			updateVisualComplexity();
+            updateVisualComplexity();
             bool is_animated_object = viewer_object->isAnimatedObject();
 			cleanupAttachedMesh(viewer_object);
+
 			attachment->removeObject(viewer_object);
             if (!is_animated_object)
             {
                 updateAttachmentOverrides();
             }
 			viewer_object->refreshBakeTexture();
-			
+		
 			LLViewerObject::const_child_list_t& child_list = viewer_object->getChildren();
 			for (LLViewerObject::child_list_t::const_iterator iter1 = child_list.begin();
 				iter1 != child_list.end(); ++iter1)
 			{
 				LLViewerObject* objectp = *iter1;
 				if (objectp)
-				{
+            {
 					objectp->refreshBakeTexture();
 				}
-			}
+            }
 
 			updateMeshVisibility();
 
@@ -8201,7 +8204,7 @@ void LLVOAvatar::getOffObject()
 
     if (mEnableDefaultMotions)
     {
-        startMotion(ANIM_AGENT_BODY_NOISE);
+	startMotion(ANIM_AGENT_BODY_NOISE);
     }
 
 	if (isSelf())
@@ -8733,8 +8736,8 @@ bool LLVOAvatar::isTooComplex() const
         // yes, this leaves them vulnerable to griefing objects... their choice
         too_complex = (   max_render_cost > 0
                           && (mVisualComplexity > max_render_cost
-                                 || (max_attachment_area > 0.0f && mAttachmentSurfaceArea > max_attachment_area)
-                              ));
+                           || (max_attachment_area > 0.0f && mAttachmentSurfaceArea > max_attachment_area)
+                           ));
 	}
 
 	return too_complex;
@@ -11174,136 +11177,136 @@ void LLVOAvatar::accountRenderComplexityForObject(
     // </FS:Ansariel>
 {
     if (attached_object && !attached_object->isHUDAttachment())
-    {
+		{
         mAttachmentVisibleTriangleCount += attached_object->recursiveGetTriangleCount();
         mAttachmentEstTriangleCount += attached_object->recursiveGetEstTrianglesMax();
         mAttachmentSurfaceArea += attached_object->recursiveGetScaledSurfaceArea();
 
-        textures.clear();
-        const LLDrawable* drawable = attached_object->mDrawable;
-        if (drawable)
-        {
-            const LLVOVolume* volume = drawable->getVOVolume();
-            if (volume)
-            {
-                F32 attachment_total_cost = 0;
-                F32 attachment_volume_cost = 0;
-                F32 attachment_texture_cost = 0;
-                F32 attachment_children_cost = 0;
+					textures.clear();
+					const LLDrawable* drawable = attached_object->mDrawable;
+					if (drawable)
+					{
+						const LLVOVolume* volume = drawable->getVOVolume();
+						if (volume)
+						{
+                            F32 attachment_total_cost = 0;
+                            F32 attachment_volume_cost = 0;
+                            F32 attachment_texture_cost = 0;
+                            F32 attachment_children_cost = 0;
                 const F32 animated_object_attachment_surcharge = 1000;
 
                 if (attached_object->isAnimatedObject())
                 {
                     attachment_volume_cost += animated_object_attachment_surcharge;
                 }
-                attachment_volume_cost += volume->getRenderCost(textures);
+							attachment_volume_cost += volume->getRenderCost(textures);
 
-                const_child_list_t children = volume->getChildren();
-                for (const_child_list_t::const_iterator child_iter = children.begin();
-                     child_iter != children.end();
-                     ++child_iter)
-                {
-                    LLViewerObject* child_obj = *child_iter;
-                    LLVOVolume *child = dynamic_cast<LLVOVolume*>( child_obj );
-                    if (child)
-                    {
-                        attachment_children_cost += child->getRenderCost(textures);
-                    }
-                }
+							const_child_list_t children = volume->getChildren();
+							for (const_child_list_t::const_iterator child_iter = children.begin();
+								  child_iter != children.end();
+								  ++child_iter)
+							{
+								LLViewerObject* child_obj = *child_iter;
+								LLVOVolume *child = dynamic_cast<LLVOVolume*>( child_obj );
+								if (child)
+								{
+									attachment_children_cost += child->getRenderCost(textures);
+								}
+							}
 
-                for (LLVOVolume::texture_cost_t::iterator volume_texture = textures.begin();
-                     volume_texture != textures.end();
-                     ++volume_texture)
-                {
-                    // add the cost of each individual texture in the linkset
-                    attachment_texture_cost += volume_texture->second;
-                }
-                attachment_total_cost = attachment_volume_cost + attachment_texture_cost + attachment_children_cost;
-                LL_DEBUGS("ARCdetail") << "Attachment costs " << attached_object->getAttachmentItemID()
-                                       << " total: " << attachment_total_cost
-                                       << ", volume: " << attachment_volume_cost
-                                       << ", textures: " << attachment_texture_cost
-                                       << ", " << volume->numChildren()
-                                       << " children: " << attachment_children_cost
-                                       << LL_ENDL;
-                // Limit attachment complexity to avoid signed integer flipping of the wearer's ACI
-                cost += (U32)llclamp(attachment_total_cost, MIN_ATTACHMENT_COMPLEXITY, max_attachment_complexity);
+							for (LLVOVolume::texture_cost_t::iterator volume_texture = textures.begin();
+								 volume_texture != textures.end();
+								 ++volume_texture)
+							{
+								// add the cost of each individual texture in the linkset
+								attachment_texture_cost += volume_texture->second;
+							}
+                            attachment_total_cost = attachment_volume_cost + attachment_texture_cost + attachment_children_cost;
+                            LL_DEBUGS("ARCdetail") << "Attachment costs " << attached_object->getAttachmentItemID()
+                                                   << " total: " << attachment_total_cost
+                                                   << ", volume: " << attachment_volume_cost
+                                                   << ", textures: " << attachment_texture_cost
+                                                   << ", " << volume->numChildren()
+                                                   << " children: " << attachment_children_cost
+                                                   << LL_ENDL;
+                            // Limit attachment complexity to avoid signed integer flipping of the wearer's ACI
+                            cost += (U32)llclamp(attachment_total_cost, MIN_ATTACHMENT_COMPLEXITY, max_attachment_complexity);
 
-                // <FS:Ansariel> Show per-item complexity in COF
-                if (isSelf())
+							// <FS:Ansariel> Show per-item complexity in COF
+							if (isSelf())
+							{
+								if (!attached_object->isTempAttachment())
+								{
+									item_complexity.insert(std::make_pair(attached_object->getAttachmentItemID(), (U32)attachment_total_cost));
+								}
+								else
+								{
+									temp_item_complexity.insert(std::make_pair(attached_object->getID(), (U32)attachment_total_cost));
+								}
+							}
+							// </FS:Ansariel>
+						}
+					}
+				}
+                if (isSelf()
+                    && attached_object
+                    && attached_object->isHUDAttachment()
+                    && !attached_object->isTempAttachment()
+                    && attached_object->mDrawable)
                 {
-                    if (!attached_object->isTempAttachment())
-                    {
-                        item_complexity.insert(std::make_pair(attached_object->getAttachmentItemID(), (U32)attachment_total_cost));
-                    }
-                    else
-                    {
-                        temp_item_complexity.insert(std::make_pair(attached_object->getID(), (U32)attachment_total_cost));
-                    }
-                }
-                // </FS:Ansariel>
-            }
-        }
-    }
-    if (isSelf()
-        && attached_object
-        && attached_object->isHUDAttachment()
-        && !attached_object->isTempAttachment()
-        && attached_object->mDrawable)
-    {
-        textures.clear();
+                    textures.clear();
 
         mAttachmentSurfaceArea += attached_object->recursiveGetScaledSurfaceArea();
 
-        const LLVOVolume* volume = attached_object->mDrawable->getVOVolume();
-        if (volume)
-        {
-            LLHUDComplexity hud_object_complexity;
-            hud_object_complexity.objectName = attached_object->getAttachmentItemName();
-            hud_object_complexity.objectId = attached_object->getAttachmentItemID();
-            std::string joint_name;
-            gAgentAvatarp->getAttachedPointName(attached_object->getAttachmentItemID(), joint_name);
-            hud_object_complexity.jointName = joint_name;
-            // get cost and individual textures
-            hud_object_complexity.objectsCost += volume->getRenderCost(textures);
-            hud_object_complexity.objectsCount++;
-
-            LLViewerObject::const_child_list_t& child_list = attached_object->getChildren();
-            for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
-                 iter != child_list.end(); ++iter)
-            {
-                LLViewerObject* childp = *iter;
-                const LLVOVolume* chld_volume = dynamic_cast<LLVOVolume*>(childp);
-                if (chld_volume)
-                {
-                    // get cost and individual textures
-                    hud_object_complexity.objectsCost += chld_volume->getRenderCost(textures);
-                    hud_object_complexity.objectsCount++;
-                }
-            }
-
-            hud_object_complexity.texturesCount += textures.size();
-
-            for (LLVOVolume::texture_cost_t::iterator volume_texture = textures.begin();
-                 volume_texture != textures.end();
-                 ++volume_texture)
-            {
-                // add the cost of each individual texture (ignores duplicates)
-                hud_object_complexity.texturesCost += volume_texture->second;
-                LLViewerFetchedTexture *tex = LLViewerTextureManager::getFetchedTexture(volume_texture->first);
-                if (tex)
-                {
-                    // Note: Texture memory might be incorect since texture might be still loading.
-                    hud_object_complexity.texturesMemoryTotal += tex->getTextureMemory();
-                    if (tex->getOriginalHeight() * tex->getOriginalWidth() >= HUD_OVERSIZED_TEXTURE_DATA_SIZE)
+                    const LLVOVolume* volume = attached_object->mDrawable->getVOVolume();
+                    if (volume)
                     {
-                        hud_object_complexity.largeTexturesCount++;
+                        LLHUDComplexity hud_object_complexity;
+                        hud_object_complexity.objectName = attached_object->getAttachmentItemName();
+                        hud_object_complexity.objectId = attached_object->getAttachmentItemID();
+                        std::string joint_name;
+                        gAgentAvatarp->getAttachedPointName(attached_object->getAttachmentItemID(), joint_name);
+                        hud_object_complexity.jointName = joint_name;
+                        // get cost and individual textures
+                        hud_object_complexity.objectsCost += volume->getRenderCost(textures);
+                        hud_object_complexity.objectsCount++;
+
+                        LLViewerObject::const_child_list_t& child_list = attached_object->getChildren();
+                        for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+                            iter != child_list.end(); ++iter)
+                        {
+                            LLViewerObject* childp = *iter;
+                            const LLVOVolume* chld_volume = dynamic_cast<LLVOVolume*>(childp);
+                            if (chld_volume)
+                            {
+                                // get cost and individual textures
+                                hud_object_complexity.objectsCost += chld_volume->getRenderCost(textures);
+                                hud_object_complexity.objectsCount++;
+                            }
+                        }
+
+                        hud_object_complexity.texturesCount += textures.size();
+
+                        for (LLVOVolume::texture_cost_t::iterator volume_texture = textures.begin();
+                            volume_texture != textures.end();
+                            ++volume_texture)
+                        {
+                            // add the cost of each individual texture (ignores duplicates)
+                            hud_object_complexity.texturesCost += volume_texture->second;
+                            LLViewerFetchedTexture *tex = LLViewerTextureManager::getFetchedTexture(volume_texture->first);
+                            if (tex)
+                            {
+                                // Note: Texture memory might be incorect since texture might be still loading.
+                                hud_object_complexity.texturesMemoryTotal += tex->getTextureMemory();
+                                if (tex->getOriginalHeight() * tex->getOriginalWidth() >= HUD_OVERSIZED_TEXTURE_DATA_SIZE)
+                                {
+                                    hud_object_complexity.largeTexturesCount++;
+                                }
+                            }
+                        }
+                        hud_complexity_list.push_back(hud_object_complexity);
                     }
                 }
-            }
-            hud_complexity_list.push_back(hud_object_complexity);
-        }
-    }
 }
 
 // Calculations for mVisualComplexity value

From 5e6890e5ab48112f058586707ff8d9406995dd4b Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 11 Sep 2019 17:28:06 +0200
Subject: [PATCH 43/97] Fix invalid XML

---
 indra/newview/skins/default/xui/de/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index a093656aa9..a31a083290 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -650,6 +650,7 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	</string>
 	<string name="TooltipOutfitNotInInventory">
 		Sie können nur Objekte oder Outfits aus Ihrem persönlichen Inventar zu „Outfits“ hinzufügen.
+	</string>
 	<string name="TooltipCantCreateOutfit">
 		Ein oder mehrere Objekte können nicht innerhalb von „Outfits“ verwendet werden.
 	</string>

From 9edf0b9a81534adf356a20d743e50e1f38013c0b Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 11 Sep 2019 22:55:38 +0200
Subject: [PATCH 44/97] Remove code not needed anymore and causing XUI warning

---
 indra/newview/llfloaterland.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 4f220475bc..df5f727070 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -2332,9 +2332,6 @@ void LLPanelLandOptions::refresh()
 			mCheckShowDirectory->setLabel(getString("DirectoryFee", map));
 		}
 	}
-
-	// <FS:Ansariel> Disable label text for show avi checkbox as well
-	getChild<LLTextBox>("allow_label5")->setColor(LLUIColorTable::instance().getColor(mSeeAvatarsCtrl->getEnabled() ? "LabelTextColor" : "LabelDisabledColor"));
 }
 
 S32 LLPanelLandOptions::getDirectoryFee()

From 2dbfb77f4f595d2c72b986997bdb030b002a95b8 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <pantera.polnocy@phoenixviewer.com>
Date: Thu, 12 Sep 2019 20:13:51 +0200
Subject: [PATCH 45/97] Translation updates to Starlight skins

---
 indra/newview/skins/starlight/xui/en/panel_group_general.xml    | 2 +-
 indra/newview/skins/starlight/xui/pl/panel_group_general.xml    | 2 +-
 indra/newview/skins/starlight/xui/pl/panel_group_roles.xml      | 1 +
 indra/newview/skins/starlightcui/xui/en/panel_group_general.xml | 2 +-
 indra/newview/skins/starlightcui/xui/pl/panel_group_general.xml | 2 +-
 indra/newview/skins/starlightcui/xui/pl/panel_group_roles.xml   | 1 +
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/indra/newview/skins/starlight/xui/en/panel_group_general.xml b/indra/newview/skins/starlight/xui/en/panel_group_general.xml
index 9c65955275..23107c3006 100644
--- a/indra/newview/skins/starlight/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_group_general.xml
@@ -250,7 +250,7 @@ Hover your mouse over the options for more help.
          layout="topleft"
          left="10"
          name="group_mature_check"
-         tool_tip="Sets whether your group contains information rated as Moderate"
+         tool_tip="Maturity ratings designate the type of content and behavior allowed in a group"
          top_pad="4"
          width="190">
 			<combo_item name="select_mature" value="Select">
diff --git a/indra/newview/skins/starlight/xui/pl/panel_group_general.xml b/indra/newview/skins/starlight/xui/pl/panel_group_general.xml
index a41b678a62..067798547d 100644
--- a/indra/newview/skins/starlight/xui/pl/panel_group_general.xml
+++ b/indra/newview/skins/starlight/xui/pl/panel_group_general.xml
@@ -46,7 +46,7 @@ By otrzymać dodatkowe wskazówki przytrzymuj kursor ponad opcjami.
 		<check_box label="Wolny wstęp" name="open_enrollement" tool_tip="Grupa oferuje wolny wstęp dla każdego i nie wymaga zaproszenia."/>
 		<check_box label="Opłata wstępu" name="check_enrollment_fee" tool_tip="Ustaw opłatę za przyłączenie się do grupy."/>
 		<spinner name="spin_enrollment_fee" tool_tip="Nowe osoby muszą zapłacić tą sumę by dołączyć do grupy, jeśli 'Opłata wstępu' jest zaznaczona."/>
-		<combo_box name="group_mature_check" tool_tip="Wybierz jeżeli uważasz, że Twoja grupa klasyfikowana jest jako Moderate.">
+		<combo_box name="group_mature_check" tool_tip="Klasyfikacja dojrzałości oraz wieku określa rodzaje treści i zachowanie dozwolone w grupie.">
 			<combo_item name="select_mature">
 				- Wybierz klasyfikację wieku -
 			</combo_item>
diff --git a/indra/newview/skins/starlight/xui/pl/panel_group_roles.xml b/indra/newview/skins/starlight/xui/pl/panel_group_roles.xml
index fd8728d0be..66b34f41f8 100644
--- a/indra/newview/skins/starlight/xui/pl/panel_group_roles.xml
+++ b/indra/newview/skins/starlight/xui/pl/panel_group_roles.xml
@@ -39,6 +39,7 @@ jedną lub wiele funkcji. Każda grupa może posiadać maksymalnie 10 funkcji,
 				<scroll_list.columns label="Tytuł" name="title"/>
 			</scroll_list>
 			<button label="Nowa funkcja" name="role_create"/>
+			<button label="Kopiuj funkcję" name="role_copy" />
 			<button label="Usuń funkcję" name="role_delete"/>
 		</panel>
 		<panel label="PRZYWILEJE" name="actions_sub_tab" tool_tip="Możesz sprawdzić szczegóły dotyczące danego przywileju oraz jakie funkcje oraz jakie osoby posiadają prawo korzystania z niego.">
diff --git a/indra/newview/skins/starlightcui/xui/en/panel_group_general.xml b/indra/newview/skins/starlightcui/xui/en/panel_group_general.xml
index 81e6131f9c..4a9f504f30 100644
--- a/indra/newview/skins/starlightcui/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/starlightcui/xui/en/panel_group_general.xml
@@ -250,7 +250,7 @@ Hover your mouse over the options for more help.
          layout="topleft"
          left="10"
          name="group_mature_check"
-         tool_tip="Sets whether your group contains information rated as Moderate"
+         tool_tip="Maturity ratings designate the type of content and behavior allowed in a group"
          top_pad="4"
          width="190">
 			<combo_item name="select_mature" value="Select">
diff --git a/indra/newview/skins/starlightcui/xui/pl/panel_group_general.xml b/indra/newview/skins/starlightcui/xui/pl/panel_group_general.xml
index a41b678a62..067798547d 100644
--- a/indra/newview/skins/starlightcui/xui/pl/panel_group_general.xml
+++ b/indra/newview/skins/starlightcui/xui/pl/panel_group_general.xml
@@ -46,7 +46,7 @@ By otrzymać dodatkowe wskazówki przytrzymuj kursor ponad opcjami.
 		<check_box label="Wolny wstęp" name="open_enrollement" tool_tip="Grupa oferuje wolny wstęp dla każdego i nie wymaga zaproszenia."/>
 		<check_box label="Opłata wstępu" name="check_enrollment_fee" tool_tip="Ustaw opłatę za przyłączenie się do grupy."/>
 		<spinner name="spin_enrollment_fee" tool_tip="Nowe osoby muszą zapłacić tą sumę by dołączyć do grupy, jeśli 'Opłata wstępu' jest zaznaczona."/>
-		<combo_box name="group_mature_check" tool_tip="Wybierz jeżeli uważasz, że Twoja grupa klasyfikowana jest jako Moderate.">
+		<combo_box name="group_mature_check" tool_tip="Klasyfikacja dojrzałości oraz wieku określa rodzaje treści i zachowanie dozwolone w grupie.">
 			<combo_item name="select_mature">
 				- Wybierz klasyfikację wieku -
 			</combo_item>
diff --git a/indra/newview/skins/starlightcui/xui/pl/panel_group_roles.xml b/indra/newview/skins/starlightcui/xui/pl/panel_group_roles.xml
index fd8728d0be..66b34f41f8 100644
--- a/indra/newview/skins/starlightcui/xui/pl/panel_group_roles.xml
+++ b/indra/newview/skins/starlightcui/xui/pl/panel_group_roles.xml
@@ -39,6 +39,7 @@ jedną lub wiele funkcji. Każda grupa może posiadać maksymalnie 10 funkcji,
 				<scroll_list.columns label="Tytuł" name="title"/>
 			</scroll_list>
 			<button label="Nowa funkcja" name="role_create"/>
+			<button label="Kopiuj funkcję" name="role_copy" />
 			<button label="Usuń funkcję" name="role_delete"/>
 		</panel>
 		<panel label="PRZYWILEJE" name="actions_sub_tab" tool_tip="Możesz sprawdzić szczegóły dotyczące danego przywileju oraz jakie funkcje oraz jakie osoby posiadają prawo korzystania z niego.">

From 80d6a541c1e66935dc3c05133ee7914e3f919f30 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Fri, 13 Sep 2019 15:03:35 +0200
Subject: [PATCH 46/97] Fix of OSX

---
 indra/newview/llpreviewnotecard.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llpreviewnotecard.h b/indra/newview/llpreviewnotecard.h
index f83f3b65b6..6685bff41d 100644
--- a/indra/newview/llpreviewnotecard.h
+++ b/indra/newview/llpreviewnotecard.h
@@ -56,7 +56,7 @@ public:
 	// llview
 	void draw() override;
 // [SL:KB] - Patch: UI-FloaterSearchReplace | Checked: 2010-11-05 (Catznip-2.3.0a) | Added: Catznip-2.3.0a
-	virtual bool hasAccelerators() const;
+	virtual bool hasAccelerators() const override;
 // [/SL:KB]
 	virtual BOOL handleKeyHere(KEY key, MASK mask) override;
 	virtual void setEnabled( BOOL enabled ) override;

From 631236f89a989831f3ede4f846e2634afaea2117 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Fri, 13 Sep 2019 15:32:33 +0200
Subject: [PATCH 47/97] Change new urls to 3p.firestormviewer.org

---
 autobuild.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 0658f33191..08cbce851a 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -258,7 +258,7 @@
               <key>hash</key>
               <string>b760b4f3ab7794a897cf7f464d92e587</string>
               <key>url</key>
-              <uri>http://downloads.phoenixviewer.com/discord_rpc-3.4.0-windows-192510505.tar.bz2</uri>
+              <uri>http://3p.firestormviewer.org/discord_rpc-3.4.0-windows-192510505.tar.bz2</uri>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -270,7 +270,7 @@
               <key>hash</key>
               <string>cefa1cdb50a85e36114ca89df66c0b5a</string>
               <key>url</key>
-              <uri>http://downloads.phoenixviewer.com/discord_rpc-3.4.0-linux64-192540843.tar.bz2</uri>
+              <uri>http://3p.firestormviewer.org/discord_rpc-3.4.0-linux64-192540843.tar.bz2</uri>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -282,7 +282,7 @@
               <key>hash</key>
               <string>3bc297a0fa47094bb52d361f80186387</string>
               <key>url</key>
-              <uri>http://downloads.phoenixviewer.com/discord_rpc-3.4.0-darwin64-192522358.tar.bz2</uri>
+              <uri>http://3p.firestormviewer.org/discord_rpc-3.4.0-darwin64-192522358.tar.bz2</uri>
             </map>
             <key>name</key>
             <string>darwin64</string>

From f01b787db3fb057791448089ce1cd67975f51dd0 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <pantera.polnocy@phoenixviewer.com>
Date: Sat, 14 Sep 2019 19:04:13 +0200
Subject: [PATCH 48/97] Viewer uninstaller: Revert 97f7e1cdea76 and give user a
 choice: to clean up, or to not to clean up

---
 .../installers/windows/installer_template.nsi |   4 +++-
 indra/newview/installers/windows/lang_de.nsi  | Bin 14154 -> 14084 bytes
 .../newview/installers/windows/lang_en-us.nsi | Bin 13076 -> 12998 bytes
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 2d93b9eb14..5831b97918 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -791,7 +791,9 @@ RMDir "$INSTDIR"
 IfFileExists "$INSTDIR" FOLDERFOUND NOFOLDER
 
 FOLDERFOUND:
-  MessageBox MB_OK $(DeleteProgramFilesMB) /SD IDOK IDOK NOFOLDER
+# Silent uninstall always removes all files (/SD IDYES)
+  MessageBox MB_YESNO $(DeleteProgramFilesMB) /SD IDYES IDNO NOFOLDER
+  RMDir /r "$INSTDIR"
 
 NOFOLDER:
 
diff --git a/indra/newview/installers/windows/lang_de.nsi b/indra/newview/installers/windows/lang_de.nsi
index fc3ef0e8347408e8a004f8119d6030abdc5dd4f2..8b4827ec0962be1d555c27c252ae03b54d75d9cd 100755
GIT binary patch
delta 56
zcmX?=*OIp(O^ef);TuCTLk2_1<oArClN+?y1XCH37*ZMX7}6LL8FGNIcyhId?Bqwv
KLYoD&t#|+gauB}&

delta 116
zcmZq4JC(N~O^efwA(0^m2#Y7nvx%B3Fyt|0G9)u(FqAMTFyu0%0$D{sRuYhv$M6j(
zn#qt3X6pb&bATenAk~xewWMW}fN~{3m<p6BW5@@pS77h}nx4my!l1W#tyVY>07If0
AUjP6A

diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi
index 83a6c68caa1da7b0c69c6ef70269e333a6559bbe..d9fd222af70c0b4d3dc8dc9b9daca9b172b21fae 100644
GIT binary patch
delta 30
mcmbP|b}V&+ociPovT~DmY4CBDFk~>KGUPJYZ(gWg%nbms7z!%@

delta 157
zcmX?>Iwfs`oO-<{LmGnuLnT8#Ln)BX1JVi%IY2UxA)O(Wp$IIN3S^}KStSe^Kvph;
z4v<{{RF%q*$WRO<6&RAiGRX|tKz1TfFGzI}SZzK-8CV5OuL4j%NJS}-%wfpk0a~rc
Upv1rhgw~T2WyCiZsfTa_0Q5>8rvLx|


From 183917e39ca9cb24cdf290eb3a6ca787412fe3a8 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Sat, 14 Sep 2019 19:20:12 +0200
Subject: [PATCH 49/97] Do not hold on to pointer of temporary.

---
 indra/newview/fsdiscordconnect.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/fsdiscordconnect.cpp b/indra/newview/fsdiscordconnect.cpp
index d06d416b16..c9ee1cc513 100644
--- a/indra/newview/fsdiscordconnect.cpp
+++ b/indra/newview/fsdiscordconnect.cpp
@@ -233,7 +233,8 @@ void FSDiscordConnect::updateRichPresence()
 	std::string appName = std::string("via " + APP_NAME);
 	discordPresence.smallImageText = appName.c_str();
 
-	discordPresence.partyId = gAgent.getRegion()->getRegionID().asString().c_str();
+	std::string regionId = gAgent.getRegion()->getRegionID().asString();
+	discordPresence.partyId = regionId.c_str();
 	discordPresence.partySize = gAgent.getRegion()->mMapAvatars.size();
 	discordPresence.partyMax = LLRegionInfoModel::instance().mAgentLimit;
 	Discord_UpdatePresence(&discordPresence);

From 48259da8a8ade1ba86c32cb3ba603671186fd530 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Sat, 14 Sep 2019 19:23:39 +0200
Subject: [PATCH 50/97] tip is 6.3.3 now

---
 indra/newview/VIEWER_VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 91e4a9f262..7849b73dc7 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-6.3.2
+6.3.3

From e2dfcfec55ff78147fa19ebb9798a8980b75f831 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 14 Sep 2019 21:45:28 +0200
Subject: [PATCH 51/97] Hide Discord menu entry if built without Discord
 integration

---
 indra/newview/llviewermenu.cpp                     | 14 ++++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index f3d29c3c9a..efdfc14a87 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -11125,6 +11125,17 @@ class FSObjectExportCollada : public view_listener_t
 };
 // </FS:CR>
 
+// <FS:Ansariel> Discord integration
+bool enable_discord_integration()
+{
+#if HAS_DISCORD
+	return true;
+#else
+	return false;
+#endif
+}
+// </FS:Ansariel>
+
 // <FS:Zi> Make sure to call this before any of the UI is set up, so all text editors can
 //         pick up the menu properly.
 void initialize_edit_menu()
@@ -11843,4 +11854,7 @@ void initialize_menus()
 	view_listener_t::addMenu(new FSObjectExportCollada(), "Object.ExportCollada");
 	enable.add("Object.EnableExport", boost::bind(&enable_export_object));
 	// </FS:Techwolf Lupindo>
+
+	// <FS:Ansariel> Discord integration
+	enable.add("FSDiscordEnabled", std::bind(&enable_discord_integration));
 }
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index a1607bd5f3..a91a98ef6e 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -604,6 +604,8 @@
         <menu_item_call.on_click
           function="Floater.Toggle"
           parameter="fs_discord"/>
+        <menu_item_call.on_visible
+          function="FSDiscordEnabled"/>
       </menu_item_call>
         <menu_item_separator/>
         <menu

From bd9b36992ef37e4fd0b4912423bee0787f9b1469 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 11 Sep 2019 19:02:59 +0300
Subject: [PATCH 52/97] SL-11218 Update Avatar Texture Debugger to reflect new
 bake channels

---
 .../xui/en/floater_avatar_textures.xml        | 137 +++++++++++++++++-
 1 file changed, 136 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
index 18bad68edc..9c93bcbc0e 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
@@ -29,11 +29,13 @@
      name="scroll_content_panel"
      follows="left|top"
      min_height="300"
+     min_width="300"
      layout="topleft"
      top="0"
      background_visible="false"
      left="0"
-	 height="680">
+     height="1165"
+     width="1015">
     <text
      type="string"
      length="1"
@@ -103,6 +105,14 @@ Textures
      name="hair_alpha"
      top_delta="0"
      width="92" />
+    <texture_picker
+     height="103"
+     label="Hair Tattoo"
+     layout="topleft"
+     left_pad="7"
+     name="hair_tattoo"
+     top_delta="0"
+     width="92" />
 
     <texture_picker
      height="103"
@@ -136,6 +146,14 @@ Textures
      name="head_tattoo"
      top_delta="0"
      width="92" />
+    <texture_picker
+     height="103"
+     label="Head Unv Tattoo"
+     layout="topleft"
+     left_pad="7"
+     name="head_universal_tattoo"
+     top_delta="0"
+     width="92" />
 
     <texture_picker
      height="103"
@@ -161,6 +179,14 @@ Textures
      name="eyes_alpha"
      top_delta="0"
      width="92" />
+    <texture_picker
+     height="103"
+     label="Eyes Tattoo"
+     layout="topleft"
+     left_pad="7"
+     name="eyes_tattoo"
+     top_delta="0"
+     width="92" />
 
     <texture_picker
      height="103"
@@ -226,6 +252,14 @@ Textures
      name="upper_tattoo"
      top_delta="0"
      width="92" />
+    <texture_picker
+     height="103"
+     label="Upper Unv Tattoo"
+     layout="topleft"
+     left_pad="7"
+     name="upper_universal_tattoo"
+     top_delta="0"
+     width="92" />
 
     <texture_picker
      height="103"
@@ -299,6 +333,14 @@ Textures
      name="lower_tattoo"
      top_delta="0"
      width="92" />
+    <texture_picker
+     height="103"
+     label="Lower Unv Tattoo"
+     layout="topleft"
+     left_pad="7"
+     name="lower_universal_tattoo"
+     top_delta="0"
+     width="92" />
 
     <texture_picker
      height="103"
@@ -316,6 +358,99 @@ Textures
      name="skirt"
      top_delta="0"
      width="92" />
+    <texture_picker
+     height="103"
+     label="Skirt Tattoo"
+     layout="topleft"
+     left_pad="7"
+     name="skirt_tattoo"
+     top_delta="0"
+     width="92" />
+
+    <texture_picker
+     height="103"
+     label="Left Arm"
+     layout="topleft"
+     left="10"
+     name="leftarm-baked"
+     top_delta="100"
+     width="92" />
+    <texture_picker
+     height="103"
+     label="Left Arm Tattoo"
+     layout="topleft"
+     left_pad="21"
+     name="leftarm_tattoo"
+     top_delta="0"
+     width="92" />
+
+    <texture_picker
+     height="103"
+     label="Left Leg"
+     layout="topleft"
+     left="10"
+     name="leftleg-baked"
+     top_delta="100"
+     width="92" />
+    <texture_picker
+     height="103"
+     label="Left Leg Tattoo"
+     layout="topleft"
+     left_pad="21"
+     name="leftleg_tattoo"
+     top_delta="0"
+     width="92" />
+
+    <texture_picker
+     height="103"
+     label="AUX 1"
+     layout="topleft"
+     left="10"
+     name="aux1-baked"
+     top_delta="100"
+     width="92" />
+    <texture_picker
+     height="103"
+     label="AUX 1 Tattoo"
+     layout="topleft"
+     left_pad="21"
+     name="aux1_tattoo"
+     top_delta="0"
+     width="92" />
+
+    <texture_picker
+     height="103"
+     label="AUX 2"
+     layout="topleft"
+     left="10"
+     name="aux2-baked"
+     top_delta="100"
+     width="92" />
+    <texture_picker
+     height="103"
+     label="AUX 2 Tattoo"
+     layout="topleft"
+     left_pad="21"
+     name="aux2_tattoo"
+     top_delta="0"
+     width="92" />
+
+    <texture_picker
+     height="103"
+     label="AUX 3"
+     layout="topleft"
+     left="10"
+     name="aux3-baked"
+     top_delta="100"
+     width="92" />
+    <texture_picker
+     height="103"
+     label="AUX 3 Tattoo"
+     layout="topleft"
+     left_pad="21"
+     name="aux3_tattoo"
+     top_delta="0"
+     width="92" />
 </panel>
 </panel>
 </scroll_container>

From 1b2579eca228633cea1f4b2e0a8444bc9e686f65 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Sat, 14 Sep 2019 02:28:34 +0300
Subject: [PATCH 53/97] SL-11536 Backed out CEF update (changeset:
 c246ab81b298)

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 85b9ba9976..ec715e61d8 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -580,9 +580,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>29e72f220f3d4b8899ce48ee5263c62e</string>
+              <string>063d23fc17a12cc523c1339797e6ab2f</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39570/336600/dullahan-1.2.201906211704_75.0.11_gf50b3c2_chromium-75.0.3770.100-darwin64-528487.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39378/333003/dullahan-1.2.201906191209_75.0.8_g5da93a1_chromium-75.0.3770.80-darwin64-528361.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -592,9 +592,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>022aed6a323c0a2d80775555b6713bf4</string>
+              <string>dc407cb4676b40de44222e7b5a01b511</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39571/336606/dullahan-1.2.201906220004_75.0.11_gf50b3c2_chromium-75.0.3770.100-windows-528487.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39381/333016/dullahan-1.2.201906191911_75.0.8_g5da93a1_chromium-75.0.3770.80-windows-528361.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -604,16 +604,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>5e9f605450feb22b01f81b26d1898eab</string>
+              <string>bbab698b2807da3c2a3dc94de3aa3084</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39572/336611/dullahan-1.2.201906220004_75.0.11_gf50b3c2_chromium-75.0.3770.100-windows64-528487.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39380/333017/dullahan-1.2.201906191911_75.0.8_g5da93a1_chromium-75.0.3770.80-windows64-528361.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.2.201906220004_75.0.11_gf50b3c2_chromium-75.0.3770.100</string>
+        <string>1.2.201906191911_75.0.8_g5da93a1_chromium-75.0.3770.80</string>
       </map>
       <key>elfio</key>
       <map>

From 11390ad8ed7f3c3ab6f586f44cebf7cc097d99f3 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Sat, 14 Sep 2019 05:13:19 +0300
Subject: [PATCH 54/97] Backed out changeset: 122dc88276c7

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index ec715e61d8..53959a2dc5 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -580,9 +580,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>063d23fc17a12cc523c1339797e6ab2f</string>
+              <string>914d49e4951b77c61df2e786a5791fb5</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39378/333003/dullahan-1.2.201906191209_75.0.8_g5da93a1_chromium-75.0.3770.80-darwin64-528361.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39275/332265/dullahan-1.2.201906171653_75.0.7_g19229b6_chromium-75.0.3770.80-darwin64-528294.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -592,9 +592,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>dc407cb4676b40de44222e7b5a01b511</string>
+              <string>e3108ed152d61d0d75d723698944802c</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39381/333016/dullahan-1.2.201906191911_75.0.8_g5da93a1_chromium-75.0.3770.80-windows-528361.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39276/332272/dullahan-1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80-windows-528294.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -604,16 +604,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>bbab698b2807da3c2a3dc94de3aa3084</string>
+              <string>2f4fe577dc0247a23dbfee6e2a965a21</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39380/333017/dullahan-1.2.201906191911_75.0.8_g5da93a1_chromium-75.0.3770.80-windows64-528361.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39277/332276/dullahan-1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80-windows64-528294.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.2.201906191911_75.0.8_g5da93a1_chromium-75.0.3770.80</string>
+        <string>1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80</string>
       </map>
       <key>elfio</key>
       <map>

From a100d62783693b9648ae8e0cd6994e2ed02ebdd2 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Sat, 14 Sep 2019 05:13:27 +0300
Subject: [PATCH 55/97] Backed out changeset: 8da237b54852

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 53959a2dc5..15f7b062a7 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -580,9 +580,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>914d49e4951b77c61df2e786a5791fb5</string>
+              <string>70397992cf465d3b1a7534d7186771fe</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39275/332265/dullahan-1.2.201906171653_75.0.7_g19229b6_chromium-75.0.3770.80-darwin64-528294.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39115/330763/dullahan-1.2.201906131357_75.0.6_g90ecd35_chromium-75.0.3770.80-darwin64-528181.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -592,9 +592,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e3108ed152d61d0d75d723698944802c</string>
+              <string>7c926f549420f75e90d79a0b25e617dd</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39276/332272/dullahan-1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80-windows-528294.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39117/330772/dullahan-1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80-windows-528181.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -604,16 +604,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>2f4fe577dc0247a23dbfee6e2a965a21</string>
+              <string>fd7bb4cc062323887d8de618be289030</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39277/332276/dullahan-1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80-windows64-528294.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39116/330775/dullahan-1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80-windows64-528181.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80</string>
+        <string>1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80</string>
       </map>
       <key>elfio</key>
       <map>

From 423a9645e09717fff56e2f288b810b90128e7374 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Sat, 14 Sep 2019 05:13:35 +0300
Subject: [PATCH 56/97] Backed out changeset: 20da15768791

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 15f7b062a7..70565ef5f0 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -580,9 +580,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>70397992cf465d3b1a7534d7186771fe</string>
+              <string>671f93c9c0198be6181bcdad12eeb1e0</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39115/330763/dullahan-1.2.201906131357_75.0.6_g90ecd35_chromium-75.0.3770.80-darwin64-528181.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39079/330374/dullahan-1.2.201906131118_75.0.1_gb5e74dd_chromium-75.0.3770.80-darwin64-528163.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -592,9 +592,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>7c926f549420f75e90d79a0b25e617dd</string>
+              <string>6044f0b2c2081f2a1cc63ab6e5682bef</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39117/330772/dullahan-1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80-windows-528181.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39081/330385/dullahan-1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows-528163.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -604,16 +604,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>fd7bb4cc062323887d8de618be289030</string>
+              <string>c00079f01c71ce46f9735174081d44f6</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39116/330775/dullahan-1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80-windows64-528181.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39080/330386/dullahan-1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows64-528163.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80</string>
+        <string>1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80</string>
       </map>
       <key>elfio</key>
       <map>

From a07b64d30e65c3b448879825150336a498e91a15 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Sat, 14 Sep 2019 05:13:45 +0300
Subject: [PATCH 57/97] Backed out changeset: 4a7dac768fae

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 70565ef5f0..52c9071574 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -580,9 +580,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>671f93c9c0198be6181bcdad12eeb1e0</string>
+              <string>11362c72e1edae9c98e6cc40d378fd37</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39079/330374/dullahan-1.2.201906131118_75.0.1_gb5e74dd_chromium-75.0.3770.80-darwin64-528163.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38952/328700/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-darwin64-528086.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -592,9 +592,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>6044f0b2c2081f2a1cc63ab6e5682bef</string>
+              <string>0980cd50e5fed4e68ee78132e5c2e240</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39081/330385/dullahan-1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows-528163.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38954/328712/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows-528086.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -604,16 +604,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>c00079f01c71ce46f9735174081d44f6</string>
+              <string>dd072189ea40ed9fa0af0f2caef866ca</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39080/330386/dullahan-1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows64-528163.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38953/328705/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows64-528086.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80</string>
+        <string>1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80</string>
       </map>
       <key>elfio</key>
       <map>

From ddbe9583ff0732ac6b8832a476fed4c6e0d54a49 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Sat, 14 Sep 2019 05:13:53 +0300
Subject: [PATCH 58/97] Backed out changeset: a6398f90389a

---
 autobuild.xml                                | 14 +++++++-------
 indra/llplugin/llpluginclassmedia.cpp        |  2 ++
 indra/llplugin/llpluginclassmedia.h          |  2 +-
 indra/media_plugins/cef/media_plugin_cef.cpp |  4 ++++
 indra/newview/llviewermedia.cpp              | 11 ++++++-----
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 52c9071574..6108c6dd42 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -580,9 +580,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>11362c72e1edae9c98e6cc40d378fd37</string>
+              <string>d7b0c8910632f50ae8d21c5d68cdaca8</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38952/328700/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-darwin64-528086.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38862/328055/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-darwin64-528032.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -592,9 +592,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>0980cd50e5fed4e68ee78132e5c2e240</string>
+              <string>9237b8e73999b539a9b2466941d02b79</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38954/328712/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows-528086.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38863/328061/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-windows-528032.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -604,16 +604,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>dd072189ea40ed9fa0af0f2caef866ca</string>
+              <string>3aef2dad2664a535d561ab4b235944db</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38953/328705/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows64-528086.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38864/328065/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-windows64-528032.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80</string>
+        <string>1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157</string>
       </map>
       <key>elfio</key>
       <map>
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 483a967db6..58069afdf9 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -857,10 +857,12 @@ void LLPluginClassMedia::paste()
 }
 
 void LLPluginClassMedia::setUserDataPath(const std::string &user_data_path_cache,
+										 const std::string &user_data_path_cookies,
 										 const std::string &user_data_path_cef_log)
 {
 	LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "set_user_data_path");
 	message.setValue("cache_path", user_data_path_cache);
+	message.setValue("cookies_path", user_data_path_cookies);
 	message.setValue("cef_log_file", user_data_path_cef_log);
 
 	bool cef_verbose_log = gSavedSettings.getBOOL("CefVerboseLog");
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index 6f2b875116..9d11ee0421 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -195,7 +195,7 @@ public:
 	bool	canPaste() const { return mCanPaste; };
 	
 	// These can be called before init(), and they will be queued and sent before the media init message.
-	void	setUserDataPath(const std::string &user_data_path_cache, const std::string &user_data_path_cef_log);
+	void	setUserDataPath(const std::string &user_data_path_cache, const std::string &user_data_path_cookies, const std::string &user_data_path_cef_log);
 	void	setLanguageCode(const std::string &language_code);
 	void	setPluginsEnabled(const bool enabled);
 	void	setJavascriptEnabled(const bool enabled);
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index 07d82d1a93..d5def44edb 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -96,6 +96,7 @@ private:
 	bool mCanCopy;
 	bool mCanPaste;
 	std::string mCachePath;
+	std::string mCookiePath;
 	std::string mCefLogFile;
 	bool mCefLogVerbose;
 	std::vector<std::string> mPickedFiles;
@@ -127,6 +128,7 @@ MediaPluginBase(host_send_func, host_user_data)
 	mCanCopy = false;
 	mCanPaste = false;
 	mCachePath = "";
+	mCookiePath = "";
 	mCefLogFile = "";
 	mCefLogVerbose = false;
 	mPickedFiles.clear();
@@ -507,6 +509,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
 				settings.background_color = 0xffffffff;
 				settings.cache_enabled = true;
 				settings.cache_path = mCachePath;
+				settings.cookie_store_path = mCookiePath;
 				settings.cookies_enabled = mCookiesEnabled;
 				settings.disable_gpu = mDisableGPU;
 				settings.flash_enabled = mPluginsEnabled;
@@ -561,6 +564,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
 				std::string user_data_path_cookies = message_in.getValue("cookies_path");
 
 				mCachePath = user_data_path_cache + "cef_cache";
+				mCookiePath = user_data_path_cookies + "cef_cookies";
 				mCefLogFile = message_in.getValue("cef_log_file");
 				mCefLogVerbose = message_in.getValueBoolean("cef_verbose_log");
 			}
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index a9eb79b649..d4487b22c9 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1731,10 +1731,12 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
 		std::string launcher_name = gDirUtilp->getLLPluginLauncher();
 		std::string plugin_name = gDirUtilp->getLLPluginFilename(plugin_basename);
 
-		// cookies now are stored in the CEF cache directory too (no more control over their location)
 		std::string user_data_path_cache = gDirUtilp->getCacheDir(false);
 		user_data_path_cache += gDirUtilp->getDirDelimiter();
 
+		std::string user_data_path_cookies = gDirUtilp->getOSUserAppDir();
+		user_data_path_cookies += gDirUtilp->getDirDelimiter();
+
 		std::string user_data_path_cef_log = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "cef_log.txt");
 
 		// Fix for EXT-5960 - make browser profile specific to user (cache, cookies etc.)
@@ -1745,9 +1747,8 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
 		std::string linden_user_dir = gDirUtilp->getLindenUserDir();
 		if ( ! linden_user_dir.empty() )
 		{
-			// cookies now are stored in the CEF cache directory too (no more control over their location)
-			user_data_path_cache = linden_user_dir;
-			user_data_path_cache += gDirUtilp->getDirDelimiter();
+			user_data_path_cookies = linden_user_dir;
+			user_data_path_cookies += gDirUtilp->getDirDelimiter();
 		};
 
 		// See if the plugin executable exists
@@ -1766,7 +1767,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
 		{
 			media_source = new LLPluginClassMedia(owner);
 			media_source->setSize(default_width, default_height);
-			media_source->setUserDataPath(user_data_path_cache, user_data_path_cef_log);
+			media_source->setUserDataPath(user_data_path_cache, user_data_path_cookies, user_data_path_cef_log);
 			media_source->setLanguageCode(LLUI::getLanguage());
 			media_source->setZoomFactor(zoom_factor);
 

From 28640c19e806aae790a4a12570e1571d46ca84ab Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Sat, 14 Sep 2019 05:13:58 +0300
Subject: [PATCH 59/97] Backed out changeset: 4273d752fb17

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 6108c6dd42..d93be8ecc6 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -580,9 +580,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>d7b0c8910632f50ae8d21c5d68cdaca8</string>
+              <string>c3c10098d8c9c86bd3392c3441591554</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38862/328055/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-darwin64-528032.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38807/327515/dullahan-1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157-darwin64-527989.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -592,9 +592,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>9237b8e73999b539a9b2466941d02b79</string>
+              <string>f8a1da6f464b3a19d2e087525ab97855</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38863/328061/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-windows-528032.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38808/327521/dullahan-1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157-windows-527989.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -604,16 +604,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>3aef2dad2664a535d561ab4b235944db</string>
+              <string>bd481e6adfe1280fef7d9f840133421e</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38864/328065/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-windows64-528032.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38809/327525/dullahan-1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157-windows64-527989.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157</string>
+        <string>1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157</string>
       </map>
       <key>elfio</key>
       <map>

From 548d688adfb65c93c85e5c380c19780e1c80261e Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Sat, 14 Sep 2019 05:14:07 +0300
Subject: [PATCH 60/97] Backed out changeset: b4182ee25942

---
 indra/llplugin/llpluginclassmedia.cpp        | 4 ----
 indra/media_plugins/cef/media_plugin_cef.cpp | 8 --------
 2 files changed, 12 deletions(-)

diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 58069afdf9..85197d1272 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -1138,10 +1138,6 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
 			mDebugMessageLevel = message.getValue("message_level");
 			mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_DEBUG_MESSAGE);
 		}
-		else if (message_name == "tooltip_text")
-		{
-			mHoverText = message.getValue("tooltip");
-		}
 		else
 		{
 			LL_WARNS("Plugin") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL;
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index d5def44edb..2f0501d018 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -62,7 +62,6 @@ private:
 	void onConsoleMessageCallback(std::string message, std::string source, int line);
 	void onStatusMessageCallback(std::string value);
 	void onTitleChangeCallback(std::string title);
-	void onTooltipCallback(std::string text);
 	void onLoadStartCallback();
 	void onRequestExitCallback();
 	void onLoadEndCallback(int httpStatusCode);
@@ -209,12 +208,6 @@ void MediaPluginCEF::onTitleChangeCallback(std::string title)
 	sendMessage(message);
 }
 
-void MediaPluginCEF::onTooltipCallback(std::string text)
-{
-    LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "tooltip_text");
-    message.setValue("tooltip", text);
-    sendMessage(message);
-}
 ////////////////////////////////////////////////////////////////////////////////
 //
 void MediaPluginCEF::onLoadStartCallback()
@@ -493,7 +486,6 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
 				mCEFLib->setOnConsoleMessageCallback(std::bind(&MediaPluginCEF::onConsoleMessageCallback, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
 				mCEFLib->setOnStatusMessageCallback(std::bind(&MediaPluginCEF::onStatusMessageCallback, this, std::placeholders::_1));
 				mCEFLib->setOnTitleChangeCallback(std::bind(&MediaPluginCEF::onTitleChangeCallback, this, std::placeholders::_1));
-				mCEFLib->setOnTooltipCallback(std::bind(&MediaPluginCEF::onTooltipCallback, this, std::placeholders::_1));
 				mCEFLib->setOnLoadStartCallback(std::bind(&MediaPluginCEF::onLoadStartCallback, this));
 				mCEFLib->setOnLoadEndCallback(std::bind(&MediaPluginCEF::onLoadEndCallback, this, std::placeholders::_1));
 				mCEFLib->setOnLoadErrorCallback(std::bind(&MediaPluginCEF::onLoadError, this, std::placeholders::_1, std::placeholders::_2));

From 2f7b6062026eb7b227e22580df6aa8dfb7234bf4 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Sat, 14 Sep 2019 05:14:24 +0300
Subject: [PATCH 61/97] Backed out changeset: 8e228364f324

---
 autobuild.xml                                | 14 +++++++-------
 indra/llplugin/llpluginclassmedia.cpp        |  4 +---
 indra/llplugin/llpluginclassmedia.h          |  2 +-
 indra/media_plugins/cef/media_plugin_cef.cpp |  7 ++-----
 indra/newview/llmediactrl.cpp                |  5 +----
 indra/newview/llpanelprimmediacontrols.cpp   | 16 ++++++++--------
 indra/newview/llviewermedia.cpp              |  4 ++--
 indra/newview/llviewermedia.h                |  2 +-
 indra/newview/llviewermediafocus.cpp         |  7 ++++++-
 9 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index d93be8ecc6..3983e12313 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -580,9 +580,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>c3c10098d8c9c86bd3392c3441591554</string>
+              <string>23aeaf23e7db2484a1850017141860dd</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38807/327515/dullahan-1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157-darwin64-527989.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34069/283470/dullahan-1.1.1320_3.3626.1895.g7001d56-darwin64-525361.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -592,9 +592,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>f8a1da6f464b3a19d2e087525ab97855</string>
+              <string>71fa66203326aca918796e874976c080</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38808/327521/dullahan-1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157-windows-527989.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34070/283477/dullahan-1.1.1320_3.3626.1895.g7001d56-windows-525361.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -604,16 +604,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>bd481e6adfe1280fef7d9f840133421e</string>
+              <string>c7162e4805f50a3609f5dc63d0cf2bc0</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38809/327525/dullahan-1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157-windows64-527989.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34071/283480/dullahan-1.1.1320_3.3626.1895.g7001d56-windows64-525361.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157</string>
+        <string>1.1.1320_3.3626.1895.g7001d56</string>
       </map>
       <key>elfio</key>
       <map>
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 85197d1272..78b1483810 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -664,14 +664,12 @@ bool LLPluginClassMedia::keyEvent(EKeyEventType type, int key_code, MASK modifie
 	return result;
 }
 
-void LLPluginClassMedia::scrollEvent(int x, int y, int clicks_x, int clicks_y, MASK modifiers)
+void LLPluginClassMedia::scrollEvent(int x, int y, MASK modifiers)
 {
 	LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "scroll_event");
 
 	message.setValueS32("x", x);
 	message.setValueS32("y", y);
-	message.setValueS32("clicks_x", clicks_x);
-	message.setValueS32("clicks_y", clicks_y);
 	message.setValue("modifiers", translateModifiers(modifiers));
 
 	sendMessage(message);
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index 9d11ee0421..4f52afb317 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -118,7 +118,7 @@ public:
 	
 	bool keyEvent(EKeyEventType type, int key_code, MASK modifiers, LLSD native_key_data);
 
-	void scrollEvent(int x, int y, int clicks_x, int clicks_y, MASK modifiers);
+	void scrollEvent(int x, int y, MASK modifiers);
 
 	// enable/disable media plugin debugging messages and info spam
 	void enableMediaPluginDebugging( bool enable );
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index 2f0501d018..eead92fd8e 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -657,13 +657,10 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
 			{
 				S32 x = message_in.getValueS32("x");
 				S32 y = message_in.getValueS32("y");
-				S32 delta_x = message_in.getValueS32("clicks_x");
-				S32 delta_y = message_in.getValueS32("clicks_y");
 				const int scaling_factor = 40;
-				delta_x *= -scaling_factor;
-				delta_y *= -scaling_factor;
+				y *= -scaling_factor;
 
-				mCEFLib->mouseWheel(x, y, delta_x, delta_y);
+				mCEFLib->mouseWheel(x, y);
 			}
 			else if (message_name == "text_event")
 			{
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 1d3a026049..7f6955d08c 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -202,10 +202,7 @@ BOOL LLMediaCtrl::handleScrollWheel( S32 x, S32 y, S32 clicks )
 {
 	if (LLPanel::handleScrollWheel(x, y, clicks)) return TRUE;
 	if (mMediaSource && mMediaSource->hasMedia())
-	{
-		convertInputCoords(x, y);
-		mMediaSource->scrollWheel(x, y, 0, clicks, gKeyboard->currentMask(TRUE));
-	}
+		mMediaSource->getMediaPlugin()->scrollEvent(0, clicks, gKeyboard->currentMask(TRUE));
 
 	return TRUE;
 }
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp
index c74c2e0fd8..5f413fc3c0 100644
--- a/indra/newview/llpanelprimmediacontrols.cpp
+++ b/indra/newview/llpanelprimmediacontrols.cpp
@@ -547,17 +547,17 @@ void LLPanelPrimMediaControls::updateShape()
 			switch (mScrollState) 
 			{
 				case SCROLL_UP:
-					media_impl->scrollWheel(0, 0, 0, -1, MASK_NONE);
+					media_impl->scrollWheel(0, -1, MASK_NONE);
 					break;
 				case SCROLL_DOWN:
-					media_impl->scrollWheel(0, 0, 0, 1, MASK_NONE);
+					media_impl->scrollWheel(0, 1, MASK_NONE);
 					break;
 				case SCROLL_LEFT:
-					media_impl->scrollWheel(0, 0, 1, 0, MASK_NONE);
+					media_impl->scrollWheel(1, 0, MASK_NONE);
 					//				media_impl->handleKeyHere(KEY_LEFT, MASK_NONE);
 					break;
 				case SCROLL_RIGHT:
-					media_impl->scrollWheel(0, 0, -1, 0, MASK_NONE);
+					media_impl->scrollWheel(-1, 0, MASK_NONE);
 					//				media_impl->handleKeyHere(KEY_RIGHT, MASK_NONE);
 					break;
 				case SCROLL_NONE:
@@ -1134,7 +1134,7 @@ void LLPanelPrimMediaControls::onScrollUp(void* user_data)
 	
 	if(impl)
 	{
-		impl->scrollWheel(0, 0, 0, -1, MASK_NONE);
+		impl->scrollWheel(0, -1, MASK_NONE);
 	}
 }
 void LLPanelPrimMediaControls::onScrollUpHeld(void* user_data)
@@ -1151,7 +1151,7 @@ void LLPanelPrimMediaControls::onScrollRight(void* user_data)
 
 	if(impl)
 	{
-		impl->scrollWheel(0, 0, -1, 0, MASK_NONE);
+		impl->scrollWheel(-1, 0, MASK_NONE);
 //		impl->handleKeyHere(KEY_RIGHT, MASK_NONE);
 	}
 }
@@ -1170,7 +1170,7 @@ void LLPanelPrimMediaControls::onScrollLeft(void* user_data)
 
 	if(impl)
 	{
-		impl->scrollWheel(0, 0, 1, 0, MASK_NONE);
+		impl->scrollWheel(1, 0, MASK_NONE);
 //		impl->handleKeyHere(KEY_LEFT, MASK_NONE);
 	}
 }
@@ -1189,7 +1189,7 @@ void LLPanelPrimMediaControls::onScrollDown(void* user_data)
 	
 	if(impl)
 	{
-		impl->scrollWheel(0, 0, 0, 1, MASK_NONE);
+		impl->scrollWheel(0, 1, MASK_NONE);
 	}
 }
 void LLPanelPrimMediaControls::onScrollDownHeld(void* user_data)
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index d4487b22c9..a27a083a2a 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -2309,14 +2309,14 @@ void LLViewerMediaImpl::mouseDoubleClick(S32 x, S32 y, MASK mask, S32 button)
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
-void LLViewerMediaImpl::scrollWheel(S32 x, S32 y, S32 scroll_x, S32 scroll_y, MASK mask)
+void LLViewerMediaImpl::scrollWheel(S32 x, S32 y, MASK mask)
 {
 	scaleMouse(&x, &y);
 	mLastMouseX = x;
 	mLastMouseY = y;
 	if (mMediaSource)
 	{
-		mMediaSource->scrollEvent(x, y, scroll_x, scroll_y, mask);
+		mMediaSource->scrollEvent(x, y, mask);
 	}
 }
 
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index bea024e952..e2e758befb 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -230,7 +230,7 @@ public:
 	void mouseMove(const LLVector2& texture_coords, MASK mask);
     void mouseDoubleClick(const LLVector2& texture_coords, MASK mask);
     void mouseDoubleClick(S32 x, S32 y, MASK mask, S32 button = 0);
-	void scrollWheel(S32 x, S32 y, S32 scroll_x, S32 scroll_y, MASK mask);
+	void scrollWheel(S32 x, S32 y, MASK mask);
 	void mouseCapture();
 	
 	void navigateBack();
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp
index b86d678196..59165c1d71 100644
--- a/indra/newview/llviewermediafocus.cpp
+++ b/indra/newview/llviewermediafocus.cpp
@@ -377,7 +377,12 @@ BOOL LLViewerMediaFocus::handleScrollWheel(S32 x, S32 y, S32 clicks)
 	LLViewerMediaImpl* media_impl = getFocusedMediaImpl();
 	if(media_impl && media_impl->hasMedia())
 	{
-		media_impl->scrollWheel(x, y, 0, clicks, gKeyboard->currentMask(TRUE));
+        // the scrollEvent() API's x and y are not the same as handleScrollWheel's x and y.
+        // The latter is the position of the mouse at the time of the event
+        // The former is the 'scroll amount' in x and y, respectively.
+        // All we have for 'scroll amount' here is 'clicks'.
+		// We're also not passed the keyboard modifier mask, but we can get that from gKeyboard.
+		media_impl->getMediaPlugin()->scrollEvent(0, clicks, gKeyboard->currentMask(TRUE));
 		retval = TRUE;
 	}
 	return retval;

From d183c21b8bda9d2937951ad677f4f6f73e452fc4 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 15 Sep 2019 00:35:38 +0200
Subject: [PATCH 62/97] Tweak layout of avatar textures floater

---
 .../xui/en/floater_avatar_textures.xml        | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
index 9c93bcbc0e..63f5ebf3ae 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
@@ -7,7 +7,7 @@
  help_topic="avatar_texture_debug"
  save_rect="true"
  title="Avatar Textures"
- width="940"
+ width="1024"
  can_resize="false">
     <floater.string
      name="InvalidAvatar">
@@ -20,11 +20,11 @@
      follows="all"
      height="680"
      layout="topleft"
-     left="5"
+     left="1"
      top_pad="15"
      name="profile_scroll"
      reserve_scroll_corner="false"
-     width="930">
+     right="-1">
     <panel
      name="scroll_content_panel"
      follows="left|top"
@@ -35,13 +35,13 @@
      background_visible="false"
      left="0"
      height="1165"
-     width="1015">
+     width="1000">
     <text
      type="string"
      length="1"
      height="16"
      layout="topleft"
-     left="15"
+     left="10"
      name="label"
      top="20"
      width="90">
@@ -53,7 +53,7 @@ Textures
      length="1"
      height="16"
      layout="topleft"
-     left_pad="22"
+     left_pad="15"
      name="composite_label"
      top_delta="0"
      width="120">
@@ -93,7 +93,7 @@ Textures
      height="103"
      label="Hair"
      layout="topleft"
-     left_pad="21"
+     left_pad="10"
      name="hair_grain"
      top_delta="0"
      width="92" />
@@ -126,7 +126,7 @@ Textures
      height="103"
      label="Makeup"
      layout="topleft"
-     left_pad="21"
+     left_pad="10"
      name="head_bodypaint"
      top_delta="0"
      width="92" />
@@ -167,7 +167,7 @@ Textures
      height="103"
      label="Eye"
      layout="topleft"
-     left_pad="21"
+     left_pad="10"
      name="eyes_iris"
      top_delta="0"
      width="92" />
@@ -200,7 +200,7 @@ Textures
      height="103"
      label="Upper BodyPaint"
      layout="topleft"
-     left_pad="21"
+     left_pad="10"
      name="upper_bodypaint"
      top_delta="0"
      width="92" />
@@ -273,7 +273,7 @@ Textures
      height="103"
      label="Lower BodyPaint"
      layout="topleft"
-     left_pad="21"
+     left_pad="10"
      name="lower_bodypaint"
      top_delta="0"
      width="92" />
@@ -354,7 +354,7 @@ Textures
      height="103"
      label="Skirt"
      layout="topleft"
-     left_pad="21"
+     left_pad="10"
      name="skirt"
      top_delta="0"
      width="92" />
@@ -379,7 +379,7 @@ Textures
      height="103"
      label="Left Arm Tattoo"
      layout="topleft"
-     left_pad="21"
+     left_pad="10"
      name="leftarm_tattoo"
      top_delta="0"
      width="92" />
@@ -396,7 +396,7 @@ Textures
      height="103"
      label="Left Leg Tattoo"
      layout="topleft"
-     left_pad="21"
+     left_pad="10"
      name="leftleg_tattoo"
      top_delta="0"
      width="92" />
@@ -413,7 +413,7 @@ Textures
      height="103"
      label="AUX 1 Tattoo"
      layout="topleft"
-     left_pad="21"
+     left_pad="10"
      name="aux1_tattoo"
      top_delta="0"
      width="92" />
@@ -430,7 +430,7 @@ Textures
      height="103"
      label="AUX 2 Tattoo"
      layout="topleft"
-     left_pad="21"
+     left_pad="10"
      name="aux2_tattoo"
      top_delta="0"
      width="92" />
@@ -447,7 +447,7 @@ Textures
      height="103"
      label="AUX 3 Tattoo"
      layout="topleft"
-     left_pad="21"
+     left_pad="10"
      name="aux3_tattoo"
      top_delta="0"
      width="92" />

From c34ef0c59831156d475cb8bbcbbd549242ed58ef Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 15 Sep 2019 00:35:46 +0200
Subject: [PATCH 63/97] Update German translation

---
 .../default/xui/de/floater_avatar_textures.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
index 01e2e442a9..cb0f874176 100644
--- a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
@@ -18,13 +18,16 @@ Texturen
 				<texture_picker label="Haare" name="hair-baked"/>
 				<texture_picker label="Haare" name="hair_grain"/>
 				<texture_picker label="Alpha: Haare" name="hair_alpha"/>
+				<texture_picker label="Haartätowierung" name="hair_tattoo"/>
 				<texture_picker label="Kopf" name="head-baked"/>
 				<texture_picker label="Make-Up" name="head_bodypaint"/>
 				<texture_picker label="Kopf: Alpha" name="head_alpha"/>
 				<texture_picker label="Kopftätowierung" name="head_tattoo"/>
+				<texture_picker label="Kopf: Uni. Tattoo" name="head_universal_tattoo"/>
 				<texture_picker label="Augen" name="eyes-baked"/>
 				<texture_picker label="Auge" name="eyes_iris"/>
 				<texture_picker label="Alpha: Augen" name="eyes_alpha"/>
+				<texture_picker label="Augen: Uni. Tattoo" name="eyes_alpha"/>
 				<texture_picker label="Oberkörper" name="upper-baked"/>
 				<texture_picker label="Oberkörperfarbe" name="upper_bodypaint"/>
 				<texture_picker label="Unterhemd" name="upper_undershirt"/>
@@ -33,6 +36,7 @@ Texturen
 				<texture_picker label="Oberjacke" name="upper_jacket"/>
 				<texture_picker label="Alpha: Oben" name="upper_alpha"/>
 				<texture_picker label="Obere Tätowierung" name="upper_tattoo"/>
+				<texture_picker label="Obere uni. Tät." name="upper_universal_tattoo"/>
 				<texture_picker label="Unterkörper" name="lower-baked"/>
 				<texture_picker label="Unterkörperfarbe" name="lower_bodypaint"/>
 				<texture_picker label="Unterhose" name="lower_underpants"/>
@@ -41,9 +45,21 @@ Texturen
 				<texture_picker label="Hose" name="lower_pants"/>
 				<texture_picker label="Jacke" name="lower_jacket"/>
 				<texture_picker label="Alpha: Unten" name="lower_alpha"/>
-				<texture_picker label="Untere Tätowierung" name="lower_tattoo"/>
+				<texture_picker label="Untere Tät." name="lower_tattoo"/>
+				<texture_picker label="Untere uni. Tät." name="lower_universal_tattoo"/>
 				<texture_picker label="Rock" name="skirt-baked"/>
 				<texture_picker label="Rock" name="skirt"/>
+				<texture_picker label="Rocktätowierung" name="skirt_tattoo"/>
+				<texture_picker label="Linker Arm" name="leftarm-baked"/>
+				<texture_picker label="L. Arm uni. Tät." name="leftarm_tattoo"/>
+				<texture_picker label="Linkes Bein" name="leftleg-baked"/>
+				<texture_picker label="L. Bein uni. Tät." name="leftleg_tattoo"/>
+				<texture_picker label="AUX 1" name="aux1-baked"/>
+				<texture_picker label="AUX 1-Tätow." name="aux1_tattoo"/>
+				<texture_picker label="AUX 2" name="aux2-baked"/>
+				<texture_picker label="AUX 2-Tätow." name="aux2_tattoo"/>
+				<texture_picker label="AUX 3" name="aux3-baked"/>
+				<texture_picker label="AUX 3-Tätow." name="aux3_tattoo"/>
 			</panel>
 		</panel>
 	</scroll_container>

From 4a98a87771db9ff395c599448158e1dcf38c989d Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <pantera.polnocy@phoenixviewer.com>
Date: Sun, 15 Sep 2019 01:51:02 +0200
Subject: [PATCH 64/97] Updated Polish translation

---
 .../default/xui/pl/floater_avatar_textures.xml      | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
index 2ea0877a9c..77e8b4737c 100644
--- a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
@@ -18,13 +18,16 @@ kompozytowe
 				<texture_picker label="Włosy" name="hair-baked"/>
 				<texture_picker label="Włosy" name="hair_grain"/>
 				<texture_picker label="Alpha włosów" name="hair_alpha"/>
+				<texture_picker label="Tatuaż włosów" name="hair_tattoo" />
 				<texture_picker label="Głowa" name="head-baked"/>
 				<texture_picker label="Makijaż" name="head_bodypaint"/>
 				<texture_picker label="Alpha głowy" name="head_alpha"/>
 				<texture_picker label="Tatuaż głowy" name="head_tattoo"/>
+				<texture_picker label="Tatuaż unw głowy" name="head_universal_tattoo" />
 				<texture_picker label="Oczy" name="eyes-baked"/>
 				<texture_picker label="Tęczówka" name="eyes_iris"/>
 				<texture_picker label="Alpha oczu" name="eyes_alpha"/>
+				<texture_picker label="Tatuaż oczu" name="eyes_tattoo" />
 				<texture_picker label="Górna cz. ciała" name="upper-baked"/>
 				<texture_picker label="Górny rys. ciała" name="upper_bodypaint"/>
 				<texture_picker label="Podkoszulek" name="upper_undershirt"/>
@@ -33,6 +36,7 @@ kompozytowe
 				<texture_picker label="Kurtka górna" name="upper_jacket"/>
 				<texture_picker label="Górna alpha" name="upper_alpha"/>
 				<texture_picker label="Górny tatuaż" name="upper_tattoo"/>
+				<texture_picker label="Górny unw tatuaż" name="upper_universal_tattoo" />
 				<texture_picker label="Dolna cz. ciała" name="lower-baked"/>
 				<texture_picker label="Dolny rys. ciała" name="lower_bodypaint"/>
 				<texture_picker label="Bielizna" name="lower_underpants"/>
@@ -42,8 +46,17 @@ kompozytowe
 				<texture_picker label="Kurtka" name="lower_jacket"/>
 				<texture_picker label="Dolna alpha" name="lower_alpha"/>
 				<texture_picker label="Dolny tatuaż" name="lower_tattoo"/>
+				<texture_picker label="Dolny unw tatuaż" name="lower_universal_tattoo" />
 				<texture_picker label="Spódnica" name="skirt-baked"/>
 				<texture_picker label="Spódnica" name="skirt"/>
+				<texture_picker label="Tatuaż: spódnica" name="skirt_tattoo" />
+				<texture_picker label="Lewe ramię" name="leftarm-baked" />
+				<texture_picker label="Tatuaż: l. ramię" name="leftarm_tattoo" />
+				<texture_picker label="Lewa noga" name="leftleg-baked" />
+				<texture_picker label="Tatuaż: l. noga" name="leftleg_tattoo" />
+				<texture_picker label="Tatuaż AUX 1" name="aux1_tattoo" />
+				<texture_picker label="Tatuaż AUX 2" name="aux2_tattoo" />
+				<texture_picker label="Tatuaż AUX 3" name="aux3_tattoo" />
 			</panel>
 		</panel>
 	</scroll_container>

From 14058a257a0e52923521ddc26e4761b745b0f90e Mon Sep 17 00:00:00 2001
From: Liny <liny@pinkfox.xyz>
Date: Mon, 16 Sep 2019 13:39:09 -0700
Subject: [PATCH 65/97] Add ability to hide SL username from discord

---
 .../newview/app_settings/settings_per_account.xml  | 11 +++++++++++
 indra/newview/fsdiscordconnect.cpp                 | 14 ++++++--------
 indra/newview/fsfloaterdiscord.cpp                 |  9 +++++++++
 indra/newview/fsfloaterdiscord.h                   |  2 ++
 .../skins/default/xui/en/floater_fs_discord.xml    | 14 +++++++++++++-
 5 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 92f6929fdc..6233072388 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -1268,5 +1268,16 @@
         <key>Value</key>
         <array></array>
         </map>
+     <key>FSShareNameToDiscord</key>
+        <map>
+        <key>Comment</key>
+            <string>If enabled, will allow Firestorm to share avatar user and display name with discord. Default (false)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
     </map>
 </llsd>
diff --git a/indra/newview/fsdiscordconnect.cpp b/indra/newview/fsdiscordconnect.cpp
index c9ee1cc513..0b658842ae 100644
--- a/indra/newview/fsdiscordconnect.cpp
+++ b/indra/newview/fsdiscordconnect.cpp
@@ -207,10 +207,11 @@ void FSDiscordConnect::updateRichPresence()
 	DiscordRichPresence discordPresence;
 	memset(&discordPresence, 0, sizeof(discordPresence));
 	discordPresence.state = region_name.c_str();
-	LLAvatarName av_name;
-	std::string name;
-	if (RlvActions::canShowName(RlvActions::SNC_DEFAULT, gAgentID))
+
+	if (RlvActions::canShowName(RlvActions::SNC_DEFAULT, gAgentID) && gSavedPerAccountSettings.getBOOL("FSShareNameToDiscord"))
 	{
+		LLAvatarName av_name;
+		std::string name;
 		if (LLAvatarNameCache::get(gAgentID, &av_name))
 		{
 			name = av_name.getCompleteName(true, true);
@@ -219,12 +220,9 @@ void FSDiscordConnect::updateRichPresence()
 		{
 			name = gAgentUsername;
 		}
+		discordPresence.details = name.c_str();
 	}
-	else
-	{
-		name = RlvStrings::getAnonym(av_name);
-	}
-	discordPresence.details = name.c_str();
+	
 	discordPresence.startTimestamp = mConnectTime;
 
 	discordPresence.largeImageKey = "secondlife_512";
diff --git a/indra/newview/fsfloaterdiscord.cpp b/indra/newview/fsfloaterdiscord.cpp
index 189b308095..46e3d0183b 100644
--- a/indra/newview/fsfloaterdiscord.cpp
+++ b/indra/newview/fsfloaterdiscord.cpp
@@ -166,6 +166,7 @@ mStatusText(nullptr)
 	mCommitCallbackRegistrar.add("FSDiscord.Connect", boost::bind(&FSFloaterDiscord::onConnect, this));
 	mCommitCallbackRegistrar.add("FSDiscord.Disconnect", boost::bind(&FSFloaterDiscord::onDisconnect, this));
 	mCommitCallbackRegistrar.add("FSDiscord.Allow", boost::bind(&FSFloaterDiscord::onAllow, this));
+	mCommitCallbackRegistrar.add("FSDiscord.Name", boost::bind(&FSFloaterDiscord::onName, this));
 	mCommitCallbackRegistrar.add("FSDiscord.Combo", boost::bind(&FSFloaterDiscord::onCombo, this));
 	mCommitCallbackRegistrar.add("FSDiscord.Add", boost::bind(&FSFloaterDiscord::onAdd, this));
 	mCommitCallbackRegistrar.add("FSDiscord.Rem", boost::bind(&FSFloaterDiscord::onRemove, this));
@@ -173,6 +174,11 @@ mStatusText(nullptr)
 	setVisibleCallback(boost::bind(&FSFloaterDiscord::onVisibilityChange, this, _2));
 }
 
+void FSFloaterDiscord::onName()
+{
+	gSavedPerAccountSettings.setBOOL("FSShareNameToDiscord", mNameCheckbox->getValue().asBoolean());
+}
+
 void FSFloaterDiscord::onCombo()
 {
 	gSavedPerAccountSettings.setU32("FSMaxSharedMaturity", mMaturityCombo->getSelectedValue().asInteger());
@@ -258,6 +264,7 @@ BOOL FSFloaterDiscord::postBuild()
 	mDisconnectButton = getChild<LLButton>("disconnect_btn");
 	mConnectButton = getChild<LLButton>("connect_btn");
 	mAllowCheckbox = getChild<LLCheckBoxCtrl>("startup_check");
+	mNameCheckbox = getChild<LLCheckBoxCtrl>("name_check");
 	mMaturityCombo = getChild<LLComboBox>("maturity_desired_combobox");
 	mBlacklistedNames = getChild<LLScrollListCtrl>("blacklisted_names");
 	mBlacklistEntry = getChild<LLLineEditor>("blacklist_entry");
@@ -276,6 +283,8 @@ BOOL FSFloaterDiscord::postBuild()
 
 	mAllowCheckbox->set(gSavedPerAccountSettings.getBOOL("FSEnableDiscordIntegration"));
 
+	mNameCheckbox->set(gSavedPerAccountSettings.getBOOL("FSShareNameToDiscord"));
+
 	// Connection status widgets
 	mStatusText = getChild<LLTextBox>("connection_status_text");
 
diff --git a/indra/newview/fsfloaterdiscord.h b/indra/newview/fsfloaterdiscord.h
index f3c04cb2a9..e7cbbe6ff4 100644
--- a/indra/newview/fsfloaterdiscord.h
+++ b/indra/newview/fsfloaterdiscord.h
@@ -51,6 +51,7 @@ private:
 	void onUseAnotherAccount();
 	void onDisconnect();
 	void onAllow();
+	void onName();
 	void onCombo();
 	void onAdd();
 	void onRemove();
@@ -65,6 +66,7 @@ private:
 	LLButton * mConnectButton;
 	LLButton * mDisconnectButton;
 	LLCheckBoxCtrl * mAllowCheckbox;
+	LLCheckBoxCtrl * mNameCheckbox;
 	LLComboBox * mMaturityCombo;
 	LLScrollListCtrl * mBlacklistedNames;
 	LLLineEditor * mBlacklistEntry;
diff --git a/indra/newview/skins/default/xui/en/floater_fs_discord.xml b/indra/newview/skins/default/xui/en/floater_fs_discord.xml
index b55f2700e1..8ba69d22e1 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_discord.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_discord.xml
@@ -10,7 +10,7 @@
   single_instance="true"
   reuse_instance="true"
   title="Discord"
-  height="462"
+  height="485"
   width="272">
   <string
 	  name="discord_connected"
@@ -57,6 +57,18 @@
 			 width="210">
 			  <commit_callback function="FSDiscord.Allow"/>
 		</check_box>
+		<check_box
+			layout="topleft"
+			 follows="left|top|right"
+			 left="10"
+			 right="-10"
+			 visible="true"
+			 height="23"
+			 label="Share username"
+			 name="name_check"
+			 width="210">
+			  <commit_callback function="FSDiscord.Name"/>
+		</check_box>
 		<button
 		 layout="topleft"
 		 follows="left|top|right"

From f21944022718290e4a21132c27abcecd39365b79 Mon Sep 17 00:00:00 2001
From: Liny <liny@pinkfox.xyz>
Date: Mon, 16 Sep 2019 13:39:29 -0700
Subject: [PATCH 66/97] Fix typo

---
 indra/newview/app_settings/settings_per_account.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 6233072388..2f9e2505de 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -1238,7 +1238,7 @@
      <key>FSEnableDiscordIntegration</key>
         <map>
         <key>Comment</key>
-            <string>If enabled, well allow Firestorm to connect to discord if open and share location data with. Default (false)</string>
+            <string>If enabled, will allow Firestorm to connect to discord if open and share location data with. Default (false)</string>
         <key>Persist</key>
             <integer>1</integer>
         <key>Type</key>

From 026cb180e9361ffbceb87c47db86fda8cb8d3cba Mon Sep 17 00:00:00 2001
From: Liny <liny@pinkfox.xyz>
Date: Mon, 16 Sep 2019 14:26:54 -0700
Subject: [PATCH 67/97] FIRE-28964 - Fixed a spelling mistake Patch from
 KatieCurtis Resident

---
 indra/newview/linux_tools/refresh_desktop_app_entry.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/linux_tools/refresh_desktop_app_entry.sh b/indra/newview/linux_tools/refresh_desktop_app_entry.sh
index aa7a08a1d7..c8f597d7de 100755
--- a/indra/newview/linux_tools/refresh_desktop_app_entry.sh
+++ b/indra/newview/linux_tools/refresh_desktop_app_entry.sh
@@ -13,7 +13,7 @@ function install_desktop_entry()
     local desktop_entry="\
 [Desktop Entry]\n\
 Name=Firestorm Viewer\n\
-Comment=Client for accessing 3D virtual words\n\
+Comment=Client for accessing 3D virtual worlds\n\
 Exec=${installation_prefix}/firestorm\n\
 Icon=${installation_prefix}/firestorm_icon.png\n\
 Terminal=false\n\

From ea06d71cd5f73e6fac7cb518d5d57fb2260705c8 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <pantera.polnocy@phoenixviewer.com>
Date: Tue, 17 Sep 2019 00:05:37 +0200
Subject: [PATCH 68/97] Updated Polish translation

---
 .../skins/default/xui/pl/floater_avatar_textures.xml        | 6 +++---
 indra/newview/skins/default/xui/pl/floater_fs_discord.xml   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
index 77e8b4737c..67524a8bd1 100644
--- a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
@@ -23,7 +23,7 @@ kompozytowe
 				<texture_picker label="Makijaż" name="head_bodypaint"/>
 				<texture_picker label="Alpha głowy" name="head_alpha"/>
 				<texture_picker label="Tatuaż głowy" name="head_tattoo"/>
-				<texture_picker label="Tatuaż unw głowy" name="head_universal_tattoo" />
+				<texture_picker label="Tatuaż un. głowy" name="head_universal_tattoo" />
 				<texture_picker label="Oczy" name="eyes-baked"/>
 				<texture_picker label="Tęczówka" name="eyes_iris"/>
 				<texture_picker label="Alpha oczu" name="eyes_alpha"/>
@@ -36,7 +36,7 @@ kompozytowe
 				<texture_picker label="Kurtka górna" name="upper_jacket"/>
 				<texture_picker label="Górna alpha" name="upper_alpha"/>
 				<texture_picker label="Górny tatuaż" name="upper_tattoo"/>
-				<texture_picker label="Górny unw tatuaż" name="upper_universal_tattoo" />
+				<texture_picker label="Górny un. tatuaż" name="upper_universal_tattoo" />
 				<texture_picker label="Dolna cz. ciała" name="lower-baked"/>
 				<texture_picker label="Dolny rys. ciała" name="lower_bodypaint"/>
 				<texture_picker label="Bielizna" name="lower_underpants"/>
@@ -46,7 +46,7 @@ kompozytowe
 				<texture_picker label="Kurtka" name="lower_jacket"/>
 				<texture_picker label="Dolna alpha" name="lower_alpha"/>
 				<texture_picker label="Dolny tatuaż" name="lower_tattoo"/>
-				<texture_picker label="Dolny unw tatuaż" name="lower_universal_tattoo" />
+				<texture_picker label="Dolny un. tatuaż" name="lower_universal_tattoo" />
 				<texture_picker label="Spódnica" name="skirt-baked"/>
 				<texture_picker label="Spódnica" name="skirt"/>
 				<texture_picker label="Tatuaż: spódnica" name="skirt_tattoo" />
diff --git a/indra/newview/skins/default/xui/pl/floater_fs_discord.xml b/indra/newview/skins/default/xui/pl/floater_fs_discord.xml
index ce93027e81..82d91ebaa3 100644
--- a/indra/newview/skins/default/xui/pl/floater_fs_discord.xml
+++ b/indra/newview/skins/default/xui/pl/floater_fs_discord.xml
@@ -9,6 +9,7 @@
 		Brak połączenia z Discord.
 	</text>
 	<check_box label="Połącz automatycznie przy logowaniu" name="startup_check" />
+	<check_box label="Udostępniaj nazwę użytkownika" name="name_check" />
 	<button label="Połącz..." name="connect_btn" />
 	<button label="Odłącz" name="disconnect_btn" />
 	<text name="rating_label">

From 5d96cf3f71fc4d2f3910cb2a3a4d4142ae79e45a Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 17 Sep 2019 14:55:06 +0300
Subject: [PATCH 69/97] SL-11917 Updated VVM

---
 autobuild.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 3983e12313..a910a004b0 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>42066e2447c7a3359784438d16510992</string>
+              <string>c5ab9d9d7482e48cd76f4bf391900a8c</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/40539/348124/viewer_manager-2.0.529188-darwin64-529188.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/43369/385585/viewer_manager-2.0.531000-darwin64-531000.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>ca230428635ce13cb7ace0f9522f8546</string>
+              <string>6b10d7407686d9e12e63576256581e3e</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/40538/348130/viewer_manager-2.0.529188-windows-529188.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/43370/385592/viewer_manager-2.0.531000-windows-531000.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>source_type</key>
         <string>hg</string>
         <key>version</key>
-        <string>2.0.529188</string>
+        <string>2.0.531000</string>
       </map>
       <key>vlc-bin</key>
       <map>

From e5324bfa17c4f6c80dc1e723fe1007b91cd12415 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 17 Sep 2019 18:20:29 +0200
Subject: [PATCH 70/97] Update German translation

---
 indra/newview/skins/default/xui/de/floater_fs_discord.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/skins/default/xui/de/floater_fs_discord.xml b/indra/newview/skins/default/xui/de/floater_fs_discord.xml
index e626613630..17dda206d6 100644
--- a/indra/newview/skins/default/xui/de/floater_fs_discord.xml
+++ b/indra/newview/skins/default/xui/de/floater_fs_discord.xml
@@ -15,6 +15,7 @@
 		Nicht mit Discord verbunden.
 	</text>
 	<check_box label="Automatisch beim Login verbinden" name="startup_check"/>
+	<check_box label="Name mit Discord teilen" name="name_check"/>
 	<button label="Verbinden..." name="connect_btn"/>
 	<button label="Trennen" name="disconnect_btn"/>
 	<text name="rating_label">

From 14c62b84b0447a41049065e0c863b7024d3f19af Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 17 Sep 2019 18:41:52 +0200
Subject: [PATCH 71/97] Refactor Discord floater

---
 indra/newview/fsfloaterdiscord.cpp            |  54 +---
 indra/newview/fsfloaterdiscord.h              |  27 +-
 .../default/xui/de/floater_fs_discord.xml     |   8 +-
 .../default/xui/en/floater_fs_discord.xml     | 294 +++++++++---------
 .../default/xui/pl/floater_fs_discord.xml     |   4 +-
 5 files changed, 172 insertions(+), 215 deletions(-)

diff --git a/indra/newview/fsfloaterdiscord.cpp b/indra/newview/fsfloaterdiscord.cpp
index 46e3d0183b..406a44e2a2 100644
--- a/indra/newview/fsfloaterdiscord.cpp
+++ b/indra/newview/fsfloaterdiscord.cpp
@@ -29,16 +29,16 @@
 
 #include "fsfloaterdiscord.h"
 
+#include "fsdiscordconnect.h"
 #include "llagent.h"
 #include "llagentui.h"
 #include "llcheckboxctrl.h"
 #include "llcombobox.h"
-#include "fsdiscordconnect.h"
 #include "llfloaterreg.h"
-#include "lltrans.h"
-#include "llviewerregion.h"
-#include "llviewercontrol.h"
 #include "lltabcontainer.h"
+#include "lltrans.h"
+#include "llviewercontrol.h"
+#include "llviewerregion.h"
 
 #include "boost/algorithm/string/case_conv.hpp"
 
@@ -48,7 +48,7 @@
 
 void FSFloaterDiscord::onVisibilityChange(BOOL visible)
 {
-	if(visible)
+	if (visible)
 	{
 		LLEventPumps::instance().obtain("DiscordConnectState").stopListening("FSDiscordAccountPanel");
 		LLEventPumps::instance().obtain("DiscordConnectState").listen("FSDiscordAccountPanel", boost::bind(&FSFloaterDiscord::onDiscordConnectStateChange, this, _1));
@@ -64,7 +64,7 @@ void FSFloaterDiscord::onVisibilityChange(BOOL visible)
 		}
 
 		//Connected
-		if(FSDiscordConnect::instance().isConnected())
+		if (FSDiscordConnect::instance().isConnected())
 		{
 			showConnectedLayout();
 		}
@@ -86,14 +86,9 @@ void FSFloaterDiscord::onVisibilityChange(BOOL visible)
 	}
 }
 
-void FSFloaterDiscord::onAllow()
-{
-	gSavedPerAccountSettings.setBOOL("FSEnableDiscordIntegration", mAllowCheckbox->get());
-}
-
 bool FSFloaterDiscord::onDiscordConnectStateChange(const LLSD& data)
 {
-	if(FSDiscordConnect::instance().isConnected())
+	if (FSDiscordConnect::instance().isConnected())
 	{
 		mAccountCaptionLabel->setText(getString("discord_connected"));
 		showConnectedLayout();
@@ -111,7 +106,7 @@ bool FSFloaterDiscord::onDiscordConnectInfoChange()
 {
 	LLSD info = FSDiscordConnect::instance().getInfo();
 
-	if(info.has("name"))
+	if (info.has("name"))
 	{
 		mAccountNameLabel->setText(info["name"].asString());
 	}
@@ -121,7 +116,7 @@ bool FSFloaterDiscord::onDiscordConnectInfoChange()
 
 void FSFloaterDiscord::showConnectButton()
 {
-	if(!mConnectButton->getVisible())
+	if (!mConnectButton->getVisible())
 	{
 		mConnectButton->setVisible(TRUE);
 		mDisconnectButton->setVisible(FALSE);
@@ -130,7 +125,7 @@ void FSFloaterDiscord::showConnectButton()
 
 void FSFloaterDiscord::hideConnectButton()
 {
-	if(mConnectButton->getVisible())
+	if (mConnectButton->getVisible())
 	{
 		mConnectButton->setVisible(FALSE);
 		mDisconnectButton->setVisible(TRUE);
@@ -140,7 +135,7 @@ void FSFloaterDiscord::hideConnectButton()
 void FSFloaterDiscord::showDisconnectedLayout()
 {
 	mAccountCaptionLabel->setText(getString("discord_disconnected"));
-	mAccountNameLabel->setText(std::string(""));
+	mAccountNameLabel->setText(std::string());
 	showConnectButton();
 }
 
@@ -161,29 +156,16 @@ void FSFloaterDiscord::onDisconnect()
 }
 
 FSFloaterDiscord::FSFloaterDiscord(const LLSD& key) : LLFloater(key),
-mStatusText(nullptr)
+	mStatusText(nullptr)
 {
 	mCommitCallbackRegistrar.add("FSDiscord.Connect", boost::bind(&FSFloaterDiscord::onConnect, this));
 	mCommitCallbackRegistrar.add("FSDiscord.Disconnect", boost::bind(&FSFloaterDiscord::onDisconnect, this));
-	mCommitCallbackRegistrar.add("FSDiscord.Allow", boost::bind(&FSFloaterDiscord::onAllow, this));
-	mCommitCallbackRegistrar.add("FSDiscord.Name", boost::bind(&FSFloaterDiscord::onName, this));
-	mCommitCallbackRegistrar.add("FSDiscord.Combo", boost::bind(&FSFloaterDiscord::onCombo, this));
 	mCommitCallbackRegistrar.add("FSDiscord.Add", boost::bind(&FSFloaterDiscord::onAdd, this));
 	mCommitCallbackRegistrar.add("FSDiscord.Rem", boost::bind(&FSFloaterDiscord::onRemove, this));
 
 	setVisibleCallback(boost::bind(&FSFloaterDiscord::onVisibilityChange, this, _2));
 }
 
-void FSFloaterDiscord::onName()
-{
-	gSavedPerAccountSettings.setBOOL("FSShareNameToDiscord", mNameCheckbox->getValue().asBoolean());
-}
-
-void FSFloaterDiscord::onCombo()
-{
-	gSavedPerAccountSettings.setU32("FSMaxSharedMaturity", mMaturityCombo->getSelectedValue().asInteger());
-}
-
 void FSFloaterDiscord::onAdd()
 {
 	std::string name = mBlacklistEntry->getText();
@@ -263,13 +245,8 @@ BOOL FSFloaterDiscord::postBuild()
 	mAccountNameLabel = getChild<LLTextBox>("account_name_label");
 	mDisconnectButton = getChild<LLButton>("disconnect_btn");
 	mConnectButton = getChild<LLButton>("connect_btn");
-	mAllowCheckbox = getChild<LLCheckBoxCtrl>("startup_check");
-	mNameCheckbox = getChild<LLCheckBoxCtrl>("name_check");
-	mMaturityCombo = getChild<LLComboBox>("maturity_desired_combobox");
 	mBlacklistedNames = getChild<LLScrollListCtrl>("blacklisted_names");
 	mBlacklistEntry = getChild<LLLineEditor>("blacklist_entry");
-	mAddBlacklist = getChild<LLButton>("blacklist_entry_add");
-	mRemBlacklist = getChild<LLButton>("blacklist_entry_rem");
 
 	LLSD list = gSavedPerAccountSettings.getLLSD("FSBlacklistedRegionNames");
 	for (LLSD::array_const_iterator iter = list.beginArray();
@@ -279,12 +256,6 @@ BOOL FSFloaterDiscord::postBuild()
 		mBlacklistedNames->addSimpleElement(iter->asString());
 	}
 
-	mMaturityCombo->selectByValue((LLSD::Integer)gSavedPerAccountSettings.getU32("FSMaxSharedMaturity"));
-
-	mAllowCheckbox->set(gSavedPerAccountSettings.getBOOL("FSEnableDiscordIntegration"));
-
-	mNameCheckbox->set(gSavedPerAccountSettings.getBOOL("FSShareNameToDiscord"));
-
 	// Connection status widgets
 	mStatusText = getChild<LLTextBox>("connection_status_text");
 
@@ -329,4 +300,3 @@ void FSFloaterDiscord::draw()
 	}
 	LLFloater::draw();
 }
-
diff --git a/indra/newview/fsfloaterdiscord.h b/indra/newview/fsfloaterdiscord.h
index e7cbbe6ff4..7f5b92784b 100644
--- a/indra/newview/fsfloaterdiscord.h
+++ b/indra/newview/fsfloaterdiscord.h
@@ -28,12 +28,12 @@
 #define FS_FSFLOATERDISCORD_H
 
 #include "llfloater.h"
-#include "lltextbox.h"
 
 class LLCheckBoxCtrl;
 class LLComboBox;
 class LLScrollListCtrl;
 class LLLineEditor;
+class LLTextBox;
 
 class FSFloaterDiscord : public LLFloater
 {
@@ -48,11 +48,7 @@ private:
 	bool onDiscordConnectStateChange(const LLSD& data);
 	bool onDiscordConnectInfoChange();
 	void onConnect();
-	void onUseAnotherAccount();
 	void onDisconnect();
-	void onAllow();
-	void onName();
-	void onCombo();
 	void onAdd();
 	void onRemove();
 
@@ -61,20 +57,13 @@ private:
 	void showDisconnectedLayout();
 	void showConnectedLayout();
 
-	LLTextBox * mAccountCaptionLabel;
-	LLTextBox * mAccountNameLabel;
-	LLButton * mConnectButton;
-	LLButton * mDisconnectButton;
-	LLCheckBoxCtrl * mAllowCheckbox;
-	LLCheckBoxCtrl * mNameCheckbox;
-	LLComboBox * mMaturityCombo;
-	LLScrollListCtrl * mBlacklistedNames;
-	LLLineEditor * mBlacklistEntry;
-	LLButton * mAddBlacklist;
-	LLButton * mRemBlacklist;
-
-	LLTextBox* mStatusText;
+	LLTextBox*			mAccountCaptionLabel;
+	LLTextBox*			mAccountNameLabel;
+	LLButton*			mConnectButton;
+	LLButton*			mDisconnectButton;
+	LLScrollListCtrl*	mBlacklistedNames;
+	LLLineEditor*		mBlacklistEntry;
+	LLTextBox*			mStatusText;
 };
 
 #endif // FS_FSFLOATERDISCORD_H
-
diff --git a/indra/newview/skins/default/xui/de/floater_fs_discord.xml b/indra/newview/skins/default/xui/de/floater_fs_discord.xml
index 17dda206d6..e849e0fa6f 100644
--- a/indra/newview/skins/default/xui/de/floater_fs_discord.xml
+++ b/indra/newview/skins/default/xui/de/floater_fs_discord.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <floater name="floater_discord" title="Discord">
-	<string name="discord_connected" value="Verbunden mit Discord als:" />
-	<string name="discord_disconnected" value="Nicht mit Discord verbunden." />
+	<string name="discord_connected">
+		Verbunden mit Discord als:
+	</string>
+	<string name="discord_disconnected">
+		Nicht mit Discord verbunden.
+	</string>
 	<string name="SocialDiscordConnecting">
 		Verbinde mit Discord...
 	</string>
diff --git a/indra/newview/skins/default/xui/en/floater_fs_discord.xml b/indra/newview/skins/default/xui/en/floater_fs_discord.xml
index 8ba69d22e1..9dff8cfb56 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_discord.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_discord.xml
@@ -1,121 +1,116 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <floater
-  positioning="cascading"
-  can_close="true"
-  can_resize="false"
-  help_topic="floater_discord"
-  layout="topleft"
-  name="floater_discord"
-  save_rect="true"
-  single_instance="true"
-  reuse_instance="true"
-  title="Discord"
-  height="485"
-  width="272">
-  <string
-	  name="discord_connected"
-	  value="You are connected to Discord as:" />
-  <string
-	  name="discord_disconnected"
-	  value="Not connected to Discord." />
-   <string name="SocialDiscordConnecting">Connecting to Discord...</string>
-   <string name="SocialDiscordErrorConnecting">Problem connecting to Discord</string>
-   <string name="SocialDiscordDisconnecting">Disconnecting from Discord...</string>
-	  <text
-	   layout="topleft"
-	   length="1"
-	   follows="top|left"
-	   font="SansSerif"
-	   height="16"
-	   left="10"
-	   name="account_caption_label"
-	   top="5"
-	   type="string">
+ positioning="cascading"
+ can_close="true"
+ can_resize="false"
+ help_topic="floater_discord"
+ layout="topleft"
+ name="floater_discord"
+ save_rect="true"
+ single_instance="true"
+ reuse_instance="true"
+ title="Discord"
+ height="485"
+ width="272">
+	<string name="discord_connected">You are connected to Discord as:</string>
+	<string name="discord_disconnected">Not connected to Discord.</string>
+	<string name="SocialDiscordConnecting">Connecting to Discord...</string>
+	<string name="SocialDiscordErrorConnecting">Problem connecting to Discord</string>
+	<string name="SocialDiscordDisconnecting">Disconnecting from Discord...</string>
+	<text
+	 layout="topleft"
+	 length="1"
+	 follows="top|left"
+	 font="SansSerif"
+	 height="16"
+	 left="10"
+	 name="account_caption_label"
+	 top="5"
+	 type="string">
 		Not connected to Discord.
-	  </text>
-	  <text
-	   layout="topleft"
-	   top_pad="2"
-	   length="1"
-	   follows="top|left"
-	   font="SansSerif"
-	   height="16"
-	   left="10"
-	   name="account_name_label"
-	   parse_urls="true"
-	   type="string"/>
-		<check_box
-			layout="topleft"
-			 follows="left|top|right"
-			 top_pad="9"
-			 left="10"
-			 right="-10"
-			 visible="true"
-			 height="23"
-			 label="Automatically connect on login"
-			 name="startup_check"
-			 width="210">
-			  <commit_callback function="FSDiscord.Allow"/>
-		</check_box>
-		<check_box
-			layout="topleft"
-			 follows="left|top|right"
-			 left="10"
-			 right="-10"
-			 visible="true"
-			 height="23"
-			 label="Share username"
-			 name="name_check"
-			 width="210">
-			  <commit_callback function="FSDiscord.Name"/>
-		</check_box>
-		<button
-		 layout="topleft"
-		 follows="left|top|right"
-		 top_pad="9"
-		 left="10"
-		 right="-10"
-		 visible="true"
-		 height="23"
-		 label="Connect..."
-		 name="connect_btn"
-		 width="210">
-		  <commit_callback function="FSDiscord.Connect"/>
-		</button>
+	</text>
+	<text
+	 layout="topleft"
+	 top_pad="2"
+	 length="1"
+	 follows="top|left"
+	 font="SansSerif"
+	 height="16"
+	 left="10"
+	 name="account_name_label"
+	 parse_urls="true"
+	 type="string"/>
+	<check_box
+	 control_name="FSEnableDiscordIntegration"
+	 layout="topleft"
+	 follows="left|top|right"
+	 top_pad="9"
+	 left="10"
+	 right="-10"
+	 visible="true"
+	 height="23"
+	 label="Automatically connect on login"
+	 name="startup_check"
+	 width="210"/>
+	<check_box
+	 control_name="FSShareNameToDiscord"
+	 layout="topleft"
+	 follows="left|top|right"
+	 left="10"
+	 right="-10"
+	 visible="true"
+	 height="23"
+	 label="Share username"
+	 name="name_check"
+	 width="210"/>
+	<button
+	 layout="topleft"
+	 follows="left|top|right"
+	 top_pad="9"
+	 left="10"
+	 right="-10"
+	 visible="true"
+	 height="23"
+	 label="Connect..."
+	 name="connect_btn"
+	 width="210">
+		<commit_callback function="FSDiscord.Connect"/>
+	</button>
 
-		<button
-		 layout="topleft"
-		 follows="left|top|right"
-		 top_delta="0"
-		 left="10"
-		 right="-10"
-		 height="23"
-		 label="Disconnect"
-		 name="disconnect_btn"
-		 width="210"
-		 visible="false">
-		  <commit_callback function="FSDiscord.Disconnect"/>
-		</button>
-	 <text
-		layout="topleft"
-		length="1"
-		follows="top|left"
-		font="SansSerif"
-		height="26"
-		word_wrap="true"
-		left="10"
-		right="-10"
-		name="rating_label"
-		top_pad="5"
-		type="string">
+	<button
+	 layout="topleft"
+	 follows="left|top|right"
+	 top_delta="0"
+	 left="10"
+	 right="-10"
+	 height="23"
+	 label="Disconnect"
+	 name="disconnect_btn"
+	 width="210"
+	 visible="false">
+		<commit_callback function="FSDiscord.Disconnect"/>
+	</button>
+	<text
+	 layout="topleft"
+	 length="1"
+	 follows="top|left"
+	 font="SansSerif"
+	 height="26"
+	 word_wrap="true"
+	 left="10"
+	 right="-10"
+	 name="rating_label"
+	 top_pad="5"
+	 type="string">
 		Share name of regions with following content rating to Discord:
 	</text>
 	<combo_box
-		follows="left|top"
-		height="23"
-		layout="topleft"
-		name="maturity_desired_combobox"
-		width="200">
+	 control_name="FSMaxSharedMaturity"
+	 follows="left|top"
+	 height="23"
+	 layout="topleft"
+	 name="maturity_desired_combobox"
+	 width="200">
 		<combo_box.item
 		 label="General, Moderate, Adult"
 		 name="Desired_Adult"
@@ -132,32 +127,31 @@
 		 label="Don't share"
 		 name="Desired_None"
 		 value="0" />
-		 <commit_callback function="FSDiscord.Combo"/>
-    </combo_box>
+	</combo_box>
 	<text
-		layout="topleft"
-		length="1"
-		follows="top|left"
-		font="SansSerif"
-		height="26"
-		word_wrap="true"
-		left="10"
-		right="-10"
-		name="dont_names_label"
-		top_pad="5"
-		type="string">
+	 layout="topleft"
+	 length="1"
+	 follows="top|left"
+	 font="SansSerif"
+	 height="26"
+	 word_wrap="true"
+	 left="10"
+	 right="-10"
+	 name="dont_names_label"
+	 top_pad="5"
+	 type="string">
 		Don't share region names to Discord if they are listed below:
 	</text>
 	<scroll_list
-     follows="top|left|right"
-     height="215"
-     layout="topleft"
-     left="10"
-     multi_select="true"
-     name="blacklisted_names"
-     sort_column="0"
-     sort_ascending="true"
-     width="250" />
+	 follows="top|left|right"
+	 height="215"
+	 layout="topleft"
+	 left="10"
+	 multi_select="true"
+	 name="blacklisted_names"
+	 sort_column="0"
+	 sort_ascending="true"
+	 width="250" />
 	<line_editor
 	 follows="left|top"
 	 bottom_delta="24"
@@ -165,8 +159,8 @@
 	 max_length_chars="256"
 	 name="blacklist_entry"
 	 width="202">
-	 <commit_callback function="FSDiscord.Add"/>
-	 </line_editor>
+		<commit_callback function="FSDiscord.Add"/>
+	</line_editor>
 	<button
 	 follows="left|top"
 	 height="20"
@@ -189,19 +183,19 @@
 	 width="20">
 		<commit_callback function="FSDiscord.Rem"/>
 	</button>
-     <text
-      name="connection_status_text"
-      type="string"
-      follows="left|bottom|right"
-      bottom_delta="20"
-      left="-262"
-      width="223"
-      height="20"
-      wrap="true"
-      halign="left"
-      valign="center"
-      text_color="EmphasisColor"
-      font="SansSerif">
-      Loading...
-    </text>
+	<text
+	 name="connection_status_text"
+	 type="string"
+	 follows="left|bottom|right"
+	 bottom_delta="20"
+	 left="-262"
+	 width="223"
+	 height="20"
+	 wrap="true"
+	 halign="left"
+	 valign="center"
+	 text_color="EmphasisColor"
+	 font="SansSerif">
+		Loading...
+	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_fs_discord.xml b/indra/newview/skins/default/xui/pl/floater_fs_discord.xml
index 82d91ebaa3..77ebdcafa9 100644
--- a/indra/newview/skins/default/xui/pl/floater_fs_discord.xml
+++ b/indra/newview/skins/default/xui/pl/floater_fs_discord.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <floater name="floater_discord">
-	<string name="discord_connected" value="Połączony/a z Discord jako:" />
-	<string name="discord_disconnected" value="Brak połączenia z Discord." />
+	<string name="discord_connected">Połączony/a z Discord jako:</string>
+	<string name="discord_disconnected">Brak połączenia z Discord.</string>
 	<string name="SocialDiscordConnecting">Łączenie z Discord...</string>
 	<string name="SocialDiscordErrorConnecting">Problem z połączeniem z Discord</string>
 	<string name="SocialDiscordDisconnecting">Odłączanie się od Discorda...</string>

From aff3c1e1f64a7e9cd8984359d583314015bfad17 Mon Sep 17 00:00:00 2001
From: Nicky <sl.nicky.ml@googlemail.com>
Date: Sat, 21 Sep 2019 00:08:08 +0200
Subject: [PATCH 72/97] FIRE-28972; Reset draw info when a face transitions
 from index to non indexed texture mode.

---
 indra/newview/lldrawpoolavatar.cpp | 6 ++++++
 indra/newview/llface.cpp           | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index e8e79ce93b..10cb5268a6 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -1745,6 +1745,12 @@ bool LLDrawPoolAvatar::getRiggedGeometry(
 	face->setIndicesIndex(0);
 		
 	//rigged faces do not batch textures
+
+	// <FS:ND> if needed reset drawinfo as the face was set up for texture for batching
+	if (face->getTextureIndex() != 0xFF )
+		face->setDrawInfo(nullptr);
+	//  <FS:ND>
+
 	face->setTextureIndex(255);
 
 	if (buffer.isNull() || buffer->getTypeMask() != data_mask || !buffer->isWriteable())
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 07cd822fce..9683c0e081 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -478,7 +478,10 @@ void LLFace::setTextureIndex(U8 index)
 		}
 		else
 		{
-			if (mDrawInfo && mDrawInfo->mTextureList.size() <= 1)
+			// <FS:ND> Restore old test, as the new one would also crash on empty texture list, which is exactly what the original test did avoid
+			//if (mDrawInfo && mDrawInfo->mTextureList.size() <= 1)
+			if (mDrawInfo && !mDrawInfo->mTextureList.empty())
+			// </FS:ND>
 			{
 				LL_ERRS() << "Face with no texture index references indexed texture draw info." << LL_ENDL;
 			}

From 8dadd1ca36e2745ba68c8672d9271ca14ed75f5f Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Sun, 22 Sep 2019 12:03:18 +0200
Subject: [PATCH 73/97] Move tip back to default branch.

---
 README_BUILD_FIRESTORM_WINDOWS.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README_BUILD_FIRESTORM_WINDOWS.txt b/README_BUILD_FIRESTORM_WINDOWS.txt
index 9ff5e4fc1c..f94956d20d 100755
--- a/README_BUILD_FIRESTORM_WINDOWS.txt
+++ b/README_BUILD_FIRESTORM_WINDOWS.txt
@@ -53,4 +53,3 @@ Logs:
 Output:
     Look for output in build-vc120-32/newview/Release for 32bit builds and build-vc120-64/newview/Release for 64bit
 
-	
\ No newline at end of file

From 04640a0dc643571bf951f2835d464b66c3037b49 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Sun, 22 Sep 2019 12:07:18 +0200
Subject: [PATCH 74/97] Tip to default.

---
 README_BUILD_FIRESTORM_LINUX.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README_BUILD_FIRESTORM_LINUX.txt b/README_BUILD_FIRESTORM_LINUX.txt
index 29d7a3220f..024a88e058 100755
--- a/README_BUILD_FIRESTORM_LINUX.txt
+++ b/README_BUILD_FIRESTORM_LINUX.txt
@@ -41,5 +41,3 @@ Logs:
 
 Output:
         Look for output in build-linux-x86_64/newview/Release
-
-

From 2d33bc29a9831e77430b3d4aafa2c0270784046d Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <pantera.polnocy@phoenixviewer.com>
Date: Tue, 24 Sep 2019 23:35:29 +0200
Subject: [PATCH 75/97] FIRE-28983 This should fix the floating Copy Role
 button on Starlight skins

---
 indra/newview/skins/starlight/xui/en/panel_group_roles.xml    | 2 +-
 indra/newview/skins/starlightcui/xui/en/panel_group_roles.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/starlight/xui/en/panel_group_roles.xml b/indra/newview/skins/starlight/xui/en/panel_group_roles.xml
index 8d498dd30b..f22f1ff7d3 100644
--- a/indra/newview/skins/starlight/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_group_roles.xml
@@ -221,7 +221,7 @@ including the Everyone and Owner Roles.
              name="role_create"
              width="120" />
             <button
-             follows="bottom|left"
+             follows="top|left"
              height="23"
              label="Copy Role"
              layout="topleft"
diff --git a/indra/newview/skins/starlightcui/xui/en/panel_group_roles.xml b/indra/newview/skins/starlightcui/xui/en/panel_group_roles.xml
index 45276e24f4..8ff2b53a22 100644
--- a/indra/newview/skins/starlightcui/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/starlightcui/xui/en/panel_group_roles.xml
@@ -221,7 +221,7 @@ including the Everyone and Owner Roles.
              name="role_create"
              width="120" />
             <button
-             follows="bottom|left"
+             follows="top|left"
              height="23"
              label="Copy Role"
              layout="topleft"

From d428d17aaaa44533073ebaa41b64ffa2afc85920 Mon Sep 17 00:00:00 2001
From: Liny <liny@pinkfox.xyz>
Date: Wed, 25 Sep 2019 01:01:25 -0700
Subject: [PATCH 76/97] After feedback from discord, add the client key into
 Variables.cmake. Note to any other third party client, please obtain your own
 key for your client so you can customize the rich presence features.

---
 indra/cmake/Discord.cmake                     | 34 ++++++++-----------
 indra/cmake/Variables.cmake                   |  3 ++
 indra/newview/CMakeLists.txt                  | 17 ++++++----
 indra/newview/fsdiscordconnect.cpp            |  4 +--
 indra/newview/fsdiscordkey.h.in               |  4 +++
 indra/newview/llviewerfloaterreg.cpp          |  4 ---
 indra/newview/llviewermenu.cpp                | 14 --------
 indra/newview/llvoavatar.cpp                  |  2 --
 .../skins/default/xui/en/menu_viewer.xml      |  2 --
 9 files changed, 32 insertions(+), 52 deletions(-)
 create mode 100644 indra/newview/fsdiscordkey.h.in

diff --git a/indra/cmake/Discord.cmake b/indra/cmake/Discord.cmake
index b035123194..908f08612b 100644
--- a/indra/cmake/Discord.cmake
+++ b/indra/cmake/Discord.cmake
@@ -1,23 +1,17 @@
 # -*- cmake -*-
 
-if (DISCORD_API_KEY)
-  include(Prebuilt)
-  use_prebuilt_binary(discord-rpc)
-  set(DISCORD_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/discord-rpc)
+include(Prebuilt)
+use_prebuilt_binary(discord-rpc)
+set(DISCORD_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/discord-rpc)
 
-  if (WINDOWS)
-    if (ADDRESS_SIZE EQUAL 32)
-      set(DISCORD_LIBRARY discord-rpc)
-    else ()
-      set(DISCORD_LIBRARY discord-rpc_x64)
-    endif(ADDRESS_SIZE EQUAL 32)
-  elseif (LINUX)
-    set(DISCORD_LIBRARY discord-rpc)
-  elseif (DARWIN)
-    set(DISCORD_LIBRARY discord-rpc)
-  endif (WINDOWS)
-
-  add_definitions( -DDISCORD_API_KEY=\"${DISCORD_API_KEY}\")
-  add_definitions( -DHAS_DISCORD )
-  set(USE_DISCORD TRUE)
-endif (DISCORD_API_KEY)
+if (WINDOWS)
+if (ADDRESS_SIZE EQUAL 32)
+  set(DISCORD_LIBRARY discord-rpc)
+else ()
+  set(DISCORD_LIBRARY discord-rpc_x64)
+endif(ADDRESS_SIZE EQUAL 32)
+elseif (LINUX)
+set(DISCORD_LIBRARY discord-rpc)
+elseif (DARWIN)
+set(DISCORD_LIBRARY discord-rpc)
+endif (WINDOWS)
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index ea98beedb6..12fc7b295f 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -210,6 +210,9 @@ set(GRID agni CACHE STRING "Target Grid")
 set(FLICKR_API_KEY "daaabff93a967e0f37fa18863bb43b29")
 set(FLICKR_API_SECRET "846f0958020b553e") 
 
+# Discord client key.
+set(DDISCORD_API_KEY "427641535253708801")
+
 set(ENABLE_SIGNING OFF CACHE BOOL "Enable signing the viewer")
 set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.")
 
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 2bcb6a09a4..2b0df3a849 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1632,10 +1632,15 @@ list(APPEND viewer_HEADER_FILES ${CMAKE_CURRENT_BINARY_DIR}/exoflickrkeys.h)
 # </exodus>
 
 #<FS:LO> Discord rich presence
-  if (USE_DISCORD)
-    LIST(APPEND viewer_HEADER_FILES fsfloaterdiscord.h fsdiscordconnect.h)
-    LIST(APPEND viewer_SOURCE_FILES fsfloaterdiscord.cpp fsdiscordconnect.cpp)
-  endif (USE_DISCORD)
+
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/fsdiscordkey.h.in
+    ${CMAKE_CURRENT_BINARY_DIR}/fsdiscordkey.h
+    @ONLY
+)
+list(APPEND viewer_HEADER_FILES ${CMAKE_CURRENT_BINARY_DIR}/fsdiscordkey.h)
+LIST(APPEND viewer_HEADER_FILES fsfloaterdiscord.h fsdiscordconnect.h)
+LIST(APPEND viewer_SOURCE_FILES fsfloaterdiscord.cpp fsdiscordconnect.cpp)
 #</FS:LO>
 
 # <FS:TS> Generate the version information header file.
@@ -2438,9 +2443,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
     ${GROWL_LIBRARY}
     )
 
-if( USE_DISCORD )
-  target_link_libraries(${VIEWER_BINARY_NAME} ${DISCORD_LIBRARY} )
-endif()
+target_link_libraries(${VIEWER_BINARY_NAME} ${DISCORD_LIBRARY} )
 
 if (BUGSPLAT_DB)
   target_link_libraries(${VIEWER_BINARY_NAME}
diff --git a/indra/newview/fsdiscordconnect.cpp b/indra/newview/fsdiscordconnect.cpp
index 0b658842ae..4aa9921578 100644
--- a/indra/newview/fsdiscordconnect.cpp
+++ b/indra/newview/fsdiscordconnect.cpp
@@ -48,9 +48,7 @@
 
 #include "boost/algorithm/string/case_conv.hpp"
 
-#ifndef DISCORD_API_KEY
-#define DISCORD_API_KEY ""
-#endif
+#include "fsdiscordkey.h"
 
 boost::scoped_ptr<LLEventPump> FSDiscordConnect::sStateWatcher(new LLEventStream("DiscordConnectState"));
 boost::scoped_ptr<LLEventPump> FSDiscordConnect::sInfoWatcher(new LLEventStream("DiscordConnectInfo"));
diff --git a/indra/newview/fsdiscordkey.h.in b/indra/newview/fsdiscordkey.h.in
new file mode 100644
index 0000000000..269745e453
--- /dev/null
+++ b/indra/newview/fsdiscordkey.h.in
@@ -0,0 +1,4 @@
+// THIS FILE IS AUTOGENERATED BY THE BUILD PROCESS
+// You can either set the keys in Variables.cmake or at the autobuild command
+
+#define DISCORD_API_KEY "@DDISCORD_API_KEY@"
\ No newline at end of file
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 6204952de8..365cd22c91 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -179,9 +179,7 @@
 #include "fsfloateravatarrendersettings.h"
 #include "fsfloatercontacts.h"
 #include "fsfloatercontactsetconfiguration.h"
-#ifdef HAS_DISCORD
 #include "fsfloaterdiscord.h"
-#endif
 #include "fsfloaterexport.h"
 #include "fsfloaterblocklist.h"
 #include "fsfloatergroup.h"
@@ -465,9 +463,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("fs_blocklist", "floater_fs_blocklist.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSFloaterBlocklist>);
 	LLFloaterReg::add("fs_add_contact", "floater_fs_contact_add.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSFloaterAddToContactSet>);
 	LLFloaterReg::add("fs_contact_set_config", "floater_fs_contact_set_configuration.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSFloaterContactSetConfiguration>);
-#ifdef HAS_DISCORD
 	LLFloaterReg::add("fs_discord", "floater_fs_discord.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSFloaterDiscord>);
-#endif
 	LLFloaterReg::add("fs_group", "floater_fs_group.xml",&LLFloaterReg::build<FSFloaterGroup>);
 	LLFloaterReg::add("fs_group_titles", "floater_fs_group_titles.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSFloaterGroupTitles>);
 	LLFloaterReg::add("fs_export", "floater_fs_export.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSFloaterObjectExport>);
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index efdfc14a87..f3d29c3c9a 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -11125,17 +11125,6 @@ class FSObjectExportCollada : public view_listener_t
 };
 // </FS:CR>
 
-// <FS:Ansariel> Discord integration
-bool enable_discord_integration()
-{
-#if HAS_DISCORD
-	return true;
-#else
-	return false;
-#endif
-}
-// </FS:Ansariel>
-
 // <FS:Zi> Make sure to call this before any of the UI is set up, so all text editors can
 //         pick up the menu properly.
 void initialize_edit_menu()
@@ -11854,7 +11843,4 @@ void initialize_menus()
 	view_listener_t::addMenu(new FSObjectExportCollada(), "Object.ExportCollada");
 	enable.add("Object.EnableExport", boost::bind(&enable_export_object));
 	// </FS:Techwolf Lupindo>
-
-	// <FS:Ansariel> Discord integration
-	enable.add("FSDiscordEnabled", std::bind(&enable_discord_integration));
 }
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 27c5c1c39d..33f87ecac1 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -130,9 +130,7 @@
 #include "llsidepanelappearance.h"
 #include "fsavatarrenderpersistence.h"
 
-#ifdef HAS_DISCORD
 #include "fsdiscordconnect.h" // <FS:LO> tapping a place that happens on landing in world to start up discord
-#endif
 
 extern F32 SPEED_ADJUST_MAX;
 extern F32 SPEED_ADJUST_MAX_SEC;
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index a91a98ef6e..a1607bd5f3 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -604,8 +604,6 @@
         <menu_item_call.on_click
           function="Floater.Toggle"
           parameter="fs_discord"/>
-        <menu_item_call.on_visible
-          function="FSDiscordEnabled"/>
       </menu_item_call>
         <menu_item_separator/>
         <menu

From bd97b2b9f105807d739798be361d108e0b34751b Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Fri, 27 Sep 2019 21:38:06 +0200
Subject: [PATCH 77/97] Move tip back to default branch.

---
 README_BUILD_FIRESTORM_WINDOWS.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README_BUILD_FIRESTORM_WINDOWS.txt b/README_BUILD_FIRESTORM_WINDOWS.txt
index f94956d20d..ae44a9e200 100755
--- a/README_BUILD_FIRESTORM_WINDOWS.txt
+++ b/README_BUILD_FIRESTORM_WINDOWS.txt
@@ -52,4 +52,3 @@ Logs:
 
 Output:
     Look for output in build-vc120-32/newview/Release for 32bit builds and build-vc120-64/newview/Release for 64bit
-

From c0834a7c4c535bfd7d45ff9bd94eec7a6a7e028d Mon Sep 17 00:00:00 2001
From: Tonya Souther <tonya.souther@gmail.com>
Date: Sat, 28 Sep 2019 18:51:04 -0500
Subject: [PATCH 78/97] Xcode 11 compile fix.

---
 indra/llwindow/llopenglview-objc.mm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index 7956bf38c9..bee2808c23 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -837,7 +837,9 @@ attributedStringInfo getSegments(NSAttributedString *str)
     [super setMarkedText:aString selectedRange:selectedRange replacementRange:replacementRange];
     if ([aString length] == 0)      // this means Input Widow becomes empty
     {
-        [_window orderOut:_window];     // Close this to avoid empty Input Window
+        //[_window orderOut:_window];     // Close this to avoid empty Input Window
+	// <FS:TS> Xcode 11 compile fix
+        [self.window orderOut:self.window];     // Close this to avoid empty Input Window
     }
 }
 
@@ -861,7 +863,9 @@ attributedStringInfo getSegments(NSAttributedString *str)
         (mKeyPressed >= 0xF700 && mKeyPressed <= 0xF8FF))
     {
         // this is case a) of above comment
-        [_window orderOut:_window];     // to avoid empty Input Window
+	// <FS:TS> Xcode 11 compile fix
+        //[_window orderOut:_window];     // to avoid empty Input Window
+        [self.window orderOut:self.window];     // to avoid empty Input Window
     }
 }
 

From 169fc57a35af3710106ca1f2d085ce90f8ea2635 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 30 Sep 2019 21:01:44 +0200
Subject: [PATCH 79/97] FIRE-29000: Update URL to Firestorm wiki

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7a803d5a7b..b8006f8533 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6744,7 +6744,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://wiki.phoenixviewer.com/[TOPIC]</string>
+      <string>https://wiki.firestormviewer.org/[TOPIC]</string>
       <key>Backup</key>
       <integer>0</integer>
     </map>

From 4ad358fe13497917cfa8d3b42660e4b6ecc9067a Mon Sep 17 00:00:00 2001
From: Tonya Souther <tonya.souther@gmail.com>
Date: Mon, 30 Sep 2019 14:43:42 -0500
Subject: [PATCH 80/97] Provide null code signing identity for Xcode 11. Thanks
 to Nicky Perrian.

---
 indra/cmake/Variables.cmake | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 12fc7b295f..68ce364e48 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -147,6 +147,9 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(DARWIN 1)
 
+  set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
+  message(STATUS "CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY = '${CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY}'")
+
   string(REGEX MATCH "-mmacosx-version-min=([^ ]+)" scratch "$ENV{LL_BUILD}")
   set(CMAKE_OSX_DEPLOYMENT_TARGET "${CMAKE_MATCH_1}")
   message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET = '${CMAKE_OSX_DEPLOYMENT_TARGET}'")

From b185affe80f42862cb1e2a5209fc7b44072c9aee Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 1 Oct 2019 18:30:40 +0200
Subject: [PATCH 81/97] Tag release 6.3.2

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 04f3542d2c..603b334154 100755
--- a/.hgtags
+++ b/.hgtags
@@ -39,6 +39,7 @@ ab632018105ccfdf8a9e5ea1a8302badd58b686e Firestorm_5.0.1_Release
 8888a131acad19c49fcff1ad2cf75c54c8a41bb8 Firestorm_6.0.1_Beta
 ba5e1592f3a79317a3ebac441ee5946a81b97fab Firestorm_6.0.2_Release
 7b5a98fba31fa019bddb3ae900c6dd94604bc8be Firestorm_6.2.4_Release
+381d04b870a59ef98cc442a5d4aeb6b38cfdbed7 Firestorm_6.3.2_Release
 bb38ff1a763738609e1b3cada6d15fa61e5e84b9 2.1.1-release
 003dd9461bfa479049afcc34545ab3431b147c7c v2start
 52d96ad3d39be29147c5b2181b3bb46af6164f0e alpha-3

From a887b2cda8b3ea0b57fd2ef77aab4bbaba4a9f32 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 1 Oct 2019 18:34:41 +0200
Subject: [PATCH 82/97] FIRE-29009: Remove Facebook floater from list of always
 showable floaters

---
 indra/newview/app_settings/settings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b8006f8533..30c2f55f03 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -18601,7 +18601,6 @@ Change of this parameter will affect the layout of buttons in notification toast
           <string>script_floater</string>
           <string>world_map</string>
           <string>preferences</string>
-          <string>facebook</string>
           <string>flickr</string>
           <string>twitter</string>
       </array>

From 566a514dd8a91680150f0058089c836e18ea141f Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 2 Oct 2019 19:43:13 +0200
Subject: [PATCH 83/97] Fix Discord not auto-connecting anymore

---
 indra/newview/llvoavatar.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 33f87ecac1..3c7b18abdd 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3080,10 +3080,9 @@ void LLVOAvatar::idleUpdateLoadingEffect()
 
 					// <FS:Zi> Animation Overrider
 					AOEngine::instance().onLoginComplete();
-#ifdef HAS_DISCORD
+
 					// <FS:LO> tapping a place that happens on landing in world to start up discord
 					FSDiscordConnect::instance().checkConnectionToDiscord(gSavedPerAccountSettings.getBOOL("FSEnableDiscordIntegration"));
-#endif
 				}
 				else
 				{

From 04f9e3cede6b572d8f36c5403565065b3d0a516d Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Sun, 6 Oct 2019 22:10:07 +0200
Subject: [PATCH 84/97] FIRE-29031; Properly handle nullptr values.

---
 indra/newview/lltoolpie.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index f9d390d311..f9f5006162 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -143,6 +143,12 @@ BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask)
 		// !transparent_object check will be covered by transparent_object == visible_object.
 		mPick = transparent_pick;
 	}
+	// <FS:ND> FIRE-29031; Handle transparent being nullptr (due to RLVa?). visible_object cannot be invalid here or the if above had been entered
+	else if( !transp_object)
+	{
+		mPick = visible_pick;
+	}
+	// </FS:ND>
 	else
 	{
 		// Select between two non-null picks

From 3dadd1a95bbf2062c9280869a386b2ec312e5e38 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <pantera.polnocy@phoenixviewer.com>
Date: Mon, 7 Oct 2019 09:54:33 +0200
Subject: [PATCH 85/97] Changed phoenixviewer.com to firestormviewer.org in few
 applicable places Obviously, search & replace (for XML files), plus some
 manual reviewing

---
 indra/llwindow/llwindowmacosx.cpp                      |  2 +-
 indra/newview/app_settings/settings.xml                |  2 +-
 indra/newview/linux_tools/client-readme.txt            | 10 +++++-----
 indra/newview/linux_tools/wrapper.sh                   |  2 +-
 indra/newview/llappviewer.cpp                          |  2 +-
 indra/newview/llpanelobject.cpp                        |  2 +-
 .../skins/default/xui/da/panel_preferences_setup.xml   |  4 ++--
 .../skins/default/xui/de/floater_media_browser.xml     |  2 +-
 .../skins/default/xui/de/floater_web_content.xml       |  4 ++--
 indra/newview/skins/default/xui/de/notifications.xml   |  4 ++--
 .../skins/default/xui/de/panel_preferences_setup.xml   |  4 ++--
 .../skins/default/xui/en/floater_media_browser.xml     |  2 +-
 .../skins/default/xui/en/floater_web_content.xml       |  4 ++--
 indra/newview/skins/default/xui/en/menu_login.xml      |  4 ++--
 indra/newview/skins/default/xui/en/menu_viewer.xml     |  8 ++++----
 indra/newview/skins/default/xui/en/notifications.xml   |  4 ++--
 .../skins/default/xui/en/panel_preferences_setup.xml   |  4 ++--
 indra/newview/skins/default/xui/en/strings.xml         |  2 +-
 .../skins/default/xui/es/floater_media_browser.xml     |  2 +-
 .../skins/default/xui/es/panel_preferences_setup.xml   |  4 ++--
 .../skins/default/xui/fr/floater_media_browser.xml     |  2 +-
 .../skins/default/xui/fr/floater_web_content.xml       |  4 ++--
 .../skins/default/xui/fr/panel_preferences_setup.xml   |  4 ++--
 .../skins/default/xui/it/floater_media_browser.xml     |  2 +-
 .../skins/default/xui/it/floater_web_content.xml       |  4 ++--
 indra/newview/skins/default/xui/it/notifications.xml   |  4 ++--
 .../skins/default/xui/it/panel_preferences_setup.xml   |  4 ++--
 .../skins/default/xui/ja/floater_web_content.xml       |  4 ++--
 indra/newview/skins/default/xui/ja/menu_viewer.xml     |  2 +-
 indra/newview/skins/default/xui/ja/notifications.xml   |  4 ++--
 .../skins/default/xui/ja/panel_preferences_setup.xml   |  4 ++--
 .../skins/default/xui/pl/floater_media_browser.xml     |  2 +-
 .../skins/default/xui/pl/floater_web_content.xml       |  4 ++--
 indra/newview/skins/default/xui/pl/notifications.xml   |  4 ++--
 .../skins/default/xui/pl/panel_preferences_setup.xml   |  4 ++--
 .../skins/default/xui/pt/panel_preferences_setup.xml   |  2 +-
 .../skins/default/xui/ru/panel_preferences_setup.xml   |  2 +-
 .../skins/default/xui/tr/panel_preferences_setup.xml   |  2 +-
 .../skins/default/xui/zh/panel_preferences_setup.xml   |  2 +-
 39 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 9868718c27..5d0961c03d 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -77,7 +77,7 @@ BOOL check_for_card(const char* RENDERER, const char* bad_card)
 			"\n"
 			"If you own a supported card and continue to receive this message, try \n"
 			"updating to the latest video card drivers. Otherwise contact the\n"
-			"Phoenix Viewer Support group in world, or visit www.phoenixviewer.com\n"
+			"Phoenix Viewer Support group in world, or visit www.firestormviewer.org\n"
 			"for support.\n"
 			"\n"
 			"You can try to run Firestorm, but it will probably crash or run\n"
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 30c2f55f03..fda34e2d72 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6757,7 +6757,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://www.phoenixviewer.com/viewerfloater/howtofloater/index.html</string>
+      <string>https://wiki.firestormviewer.org/start#basic_functions</string>
       <key>Backup</key>
       <integer>0</integer>
     </map>    
diff --git a/indra/newview/linux_tools/client-readme.txt b/indra/newview/linux_tools/client-readme.txt
index ac256239a8..71f0b65155 100644
--- a/indra/newview/linux_tools/client-readme.txt
+++ b/indra/newview/linux_tools/client-readme.txt
@@ -126,7 +126,7 @@ SOLUTION:- Usually this indicates that your graphics card does not meet
    <https://help.ubuntu.com/community/BinaryDriverHowto>
  * If your distribution does not make it easy, then you can download the
    required Linux drivers straight from your graphics card manufacturer:
-   - <http://wiki.phoenixviewer.com/phoenix_downloads#video_drivers>
+   - <https://wiki.firestormviewer.org/downloads#video_drivers>
 
 PROBLEM 2:- My whole system seems to hang when running Firestorm.
 SOLUTION:- This is typically a hardware/driver issue.  The first thing to
@@ -201,19 +201,19 @@ configuration options for advanced troubleshooters.
 
 We're pleased to have released Firestorm client's source code under
 an Open Source license compatible with the 'LGPL'.
-<http://wiki.phoenixviewer.com/phoenix_downloads#source_code>
+<https://wiki.firestormviewer.org/downloads#source_code>
 
 
 8. GETTING MORE HELP AND REPORTING PROBLEMS
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 For general help and support with Firestorm:
-<http://wiki.phoenixviewer.com>
+<http://wiki.firestormviewer.org>
 
 In-world discussion: 
 
 Main support: Join one of our in-world support groups.
-<http://wiki.phoenixviewer.com/firestorm_in-world_groups>
+<http://wiki.firestormviewer.org/firestorm_in-world_groups>
 
 There is also a 'Linux Client Users' group inside Second Life which 
 is free to join.  You can find it by pressing the 'Search' button at 
@@ -222,7 +222,7 @@ searching for 'Linux'.  This group is useful for discussing Linux
 issues with fellow Linux client users who are online.
 
 The Firestorm Issue Tracker:
-<http://jira.phoenixviewer.com/>
+<https://jira.firestormviewer.org/>
 This is the right place for finding known issues and reporting new
 bugs in all Firestorm releases if you find that the Troubleshooting
 section in this file hasn't helped.
diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh
index 6f924f50b3..0654a07b4e 100755
--- a/indra/newview/linux_tools/wrapper.sh
+++ b/indra/newview/linux_tools/wrapper.sh
@@ -183,7 +183,7 @@ most common problems when launching the Viewer (particularly
 loading shared libraries') may be solved by enabling 32-bit
 architecture and installing one or more 32-bit compatibility libraries.
 Consult the Firestorm wiki at
-http://wiki.phoenixviewer.com/32-bit_viewer_in_64-bit_linux
+http://wiki.firestormviewer.org/32-bit_viewer_in_64-bit_linux
 EOFMARKER
 	fi
 fi
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 26b286b291..b8dea0fd3d 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3733,7 +3733,7 @@ LLSD LLAppViewer::getViewerInfo() const
 	// https://releasenotes.secondlife.com/viewer/2.1.0.123456.html
 	std::string url = LLTrans::getString("RELEASE_NOTES_BASE_URL");
 	// <FS:Ansariel> FIRE-13993: Leave out channel so we can use a URL like
-	//                           http://wiki.phoenixviewer.com/firestorm_change_log_x.y.z.rev
+	//                           http://wiki.firestormviewer.org/firestorm_change_log_x.y.z.rev
 	//if (! LLStringUtil::endsWith(url, "/"))
 	//	url += "/";
 	//url += LLURI::escape(LLVersionInfo::getVersion()) + ".html";
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 172def4395..8d670f8c80 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -1546,7 +1546,7 @@ void LLPanelObject::activateMeshFields(LLViewerObject * objectp)
 	childSetVisible("ObjectLODbehaviourLabel", true);
 
 	// Setup the LL defaults
-	factor = 1.125f; // LL default for most people http://wiki.phoenixviewer.com/support:whirly_fizzle#lod_comparison
+	factor = 1.125f; // LL default for most people http://wiki.firestormviewer.org/support:whirly_fizzle#lod_comparison
 	args["FACTOR"] = llformat("%.3f", factor);
 	tb = getChild<LLTextBox>("LOD_swap_ll_default");
 	tb->setToolTip(getString("ll_lod_tooltip_msg",args));
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
index 808723dfce..e1b845d02d 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
@@ -3,7 +3,7 @@
 	<tab_container name="max_bandwidth_layout">
 		<panel label="Netværk" name="tab-conn">
 			<text name="Maximum bandwidth">
-				Maksimum båndbredde ([http://wiki.phoenixviewer.com/fs_speedtest need a suggestion?]):
+				Maksimum båndbredde ([http://wiki.firestormviewer.org/fs_speedtest need a suggestion?]):
 			</text>
 			<check_box label="Speciel port" name="connection_port_enabled"/>
 			<spinner label="Port nummer:" name="connection_port"/>
@@ -14,7 +14,7 @@
 		</panel>
 		<panel label="Placering" name="tab-dir">
 			<text name="cache_size_label_l">
-				Cache størrelse ([http://wiki.phoenixviewer.com/cache need a suggestion?]):
+				Cache størrelse ([http://wiki.firestormviewer.org/cache need a suggestion?]):
 			</text>
 			<text name="Cache location">
 				Cache placering:
diff --git a/indra/newview/skins/default/xui/de/floater_media_browser.xml b/indra/newview/skins/default/xui/de/floater_media_browser.xml
index c0597b708d..ddab7f25c7 100644
--- a/indra/newview/skins/default/xui/de/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/de/floater_media_browser.xml
@@ -26,7 +26,7 @@
 Das Medien-Browser-Plugin lädt gerade.
 Sollte das Plugin nicht laden, sind Informationen zur Problemlösung erhältlich unter
 
-http://wiki.phoenixviewer.com/fs_media
+http://wiki.firestormviewer.org/fs_media
 			</text>
 			<button label="In meinem Browser öffnen" name="open_browser"/>
 			<check_box label="Immer in meinem Browser öffnen" name="open_always"/>
diff --git a/indra/newview/skins/default/xui/de/floater_web_content.xml b/indra/newview/skins/default/xui/de/floater_web_content.xml
index 4c267bcf46..b72d17745b 100644
--- a/indra/newview/skins/default/xui/de/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/de/floater_web_content.xml
@@ -18,11 +18,11 @@
 Das Web-Browser-Plugin lädt gerade.
 Sollte das Plugin nicht laden, sind Informationen zur Problemlösung erhältlich unter
 
-http://wiki.phoenixviewer.com/fs_search_issues
+http://wiki.firestormviewer.org/fs_search_issues
 
 und
 
-http://wiki.phoenixviewer.com/fs_media
+http://wiki.firestormviewer.org/fs_media
 			</text>
 		</layout_panel>
 	</layout_stack>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 2f9f1c3aad..970ae2f452 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -3608,7 +3608,7 @@ Bitte prüfen Sie Ihre Netzwerk- und Firewall-Konfiguration.
 Deaktivieren Sie alle SIP ALG-Funktionen in Ihrem Router. 
 
 Voice-Kommunikation ist leider nicht verfügbar.
-[https://wiki.phoenixviewer.com/fs_voice]
+[https://wiki.firestormviewer.org/fs_voice]
 		<usetemplate name="okignore" yestext="OK" ignoretext="Warnen, wenn keine Verbindung zum Voice-Server hergestellt werden kann."/>
 	</notification>
 	<notification name="NoVoiceConnect-GIAB">
@@ -3616,7 +3616,7 @@ Voice-Kommunikation ist leider nicht verfügbar.
 
 Voice-Kommunikation ist leider nicht verfügbar.
 Bitte überprüfen Sie Ihr Netzwerk- und Firewall-Setup.
-[https://wiki.phoenixviewer.com/fs_voice]
+[https://wiki.firestormviewer.org/fs_voice]
 		<usetemplate name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="AvatarRezLeftNotification">
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
index 711cd245b3..b07e7143a1 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
@@ -3,7 +3,7 @@
 	<tab_container name="max_bandwidth_layout">
 		<panel label="Verbindung" name="tab-conn">
 			<text name="Maximum bandwidth">
-				Maximale Bandbreite ([http://wiki.phoenixviewer.com/fs_speedtest Empfehlungen anzeigen?]):
+				Maximale Bandbreite ([http://wiki.firestormviewer.org/fs_speedtest Empfehlungen anzeigen?]):
 			</text>
 			<text name="NetworkPrefText1">
 				Funk
@@ -47,7 +47,7 @@
 		</panel>
 		<panel label="Verzeichnisse" name="tab-dir">
 			<text name="cache_size_label_l">
-				Cache-Größe ([http://wiki.phoenixviewer.com/cache Empfehlungen anzeigen?]):
+				Cache-Größe ([http://wiki.firestormviewer.org/cache Empfehlungen anzeigen?]):
 			</text>
 			<button label="Inventar-Cache löschen" width="137" name="ClearInventoryCache"/>
 			<text name="Cache location">
diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index aab7699fb5..d5d704d010 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -202,7 +202,7 @@
 The web browser plugin seems to be taking a while to open.
 If the plugin never loads, please visit:
 
-http://wiki.phoenixviewer.com/fs_media
+http://wiki.firestormviewer.org/fs_media
 
 for possible steps to resolve this issue.
           </text>
diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index a193db62ad..36e1004826 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -202,11 +202,11 @@
 The web browser plugin seems to be taking a while to open.
 If the plugin never loads, please visit:
 
-http://wiki.phoenixviewer.com/fs_search_issues
+http://wiki.firestormviewer.org/fs_search_issues
 
 and
 
-http://wiki.phoenixviewer.com/fs_media
+http://wiki.firestormviewer.org/fs_media
 
 for possible steps to resolve this issue.
       </text>
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 24111598aa..6994cd0c8f 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -63,7 +63,7 @@
             <menu_item_call.on_click
              function="PromptShowURL"
              name="script_library_url"
-             parameter="WebLaunchExternalTarget,http://wiki.phoenixviewer.com/doku.php?id=start" />
+             parameter="WebLaunchExternalTarget,http://wiki.firestormviewer.org/doku.php?id=start" />
        </menu_item_call>
        <menu_item_call
         label="Troubleshooting"
@@ -71,7 +71,7 @@
            <menu_item_call.on_click
             function="PromptShowURL"
             name="wiki_troubleshooting_url"
-            parameter="WebLaunchExternalTarget,http://wiki.phoenixviewer.com/firestorm_troubleshooting" />
+            parameter="WebLaunchExternalTarget,http://wiki.firestormviewer.org/firestorm_troubleshooting" />
        </menu_item_call>
 <!--
        <menu_item_separator />
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index a1607bd5f3..78b7785b74 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2072,7 +2072,7 @@
              <menu_item_call.on_click
              function="PromptShowURL"
              name="script_library_url"
-             parameter="WebLaunchExternalTarget,http://wiki.phoenixviewer.com" />
+             parameter="WebLaunchExternalTarget,http://wiki.firestormviewer.org" />
         </menu_item_call>
         
         <menu_item_call
@@ -2081,7 +2081,7 @@
             <menu_item_call.on_click
              function="PromptShowURL"
              name="wiki_troubleshooting_url"
-             parameter="WebLaunchExternalTarget,http://wiki.phoenixviewer.com/firestorm_troubleshooting" />
+             parameter="WebLaunchExternalTarget,http://wiki.firestormviewer.org/firestorm_troubleshooting" />
         </menu_item_call>
 	   
         <menu_item_call
@@ -2089,7 +2089,7 @@
          name="firestorm_support_group">
             <menu_item_call.on_click
              function="Advanced.WebBrowserTest"
-             parameter="http://wiki.phoenixviewer.com/firestorm_support_groups_join" />
+             parameter="http://wiki.firestormviewer.org/firestorm_support_groups_join" />
             <menu_item_call.on_visible
              function="GridCheck"
              parameter="secondlife" />
@@ -2101,7 +2101,7 @@
              <menu_item_call.on_click
              function="PromptShowURL"
              name="wiki_classes_url"
-             parameter="WebLaunchExternalTarget,http://wiki.phoenixviewer.com/firestorm_classes" />
+             parameter="WebLaunchExternalTarget,http://wiki.firestormviewer.org/firestorm_classes" />
         </menu_item_call>
 
         <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 35f426c3af..cdfdd7f0df 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9286,7 +9286,7 @@ Please check your network and firewall setup.
 Disable any SIP ALG feature in your router.
 
 Voice communications will not be available.
-[https://wiki.phoenixviewer.com/fs_voice]
+[https://wiki.firestormviewer.org/fs_voice]
     <tag>voice</tag>
   <tag>fail</tag>
     <usetemplate
@@ -9303,7 +9303,7 @@ We're having trouble connecting to your voice server.
 
 Voice communications will not be available.
 Please check your network and firewall setup.
-[https://wiki.phoenixviewer.com/fs_voice]
+[https://wiki.firestormviewer.org/fs_voice]
     <tag>voice</tag>
   <tag>fail</tag>
     <usetemplate
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 5f56fe4fc9..0d2f68362c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -43,7 +43,7 @@
 		 mouse_opaque="false"
 		 top_pad="15"
 		 width="500">
-			Maximum bandwidth ([http://wiki.phoenixviewer.com/fs_speedtest need a suggestion?]):
+			Maximum bandwidth ([http://wiki.firestormviewer.org/fs_speedtest need a suggestion?]):
 		</text>
 
 		<icon
@@ -411,7 +411,7 @@
 		 name="cache_size_label_l"
 		 top_pad="15"
 		 width="500">
-		   Cache size ([http://wiki.phoenixviewer.com/cache need a suggestion?]):
+		   Cache size ([http://wiki.firestormviewer.org/cache need a suggestion?]):
 		</text>
 		<slider
 		 can_edit_text="true"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index bfa3963f85..a133bef2b7 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -374,7 +374,7 @@ Please try logging in again in a minute.</string>
 
 	<string name="ReleaseNotes">Release Notes</string>
 	<!-- Always mark translate="false" for strings that are nothing but URLs, as they don't need translation. -->
-	<string name="RELEASE_NOTES_BASE_URL" translate="false">http://wiki.phoenixviewer.com/firestorm_change_log_</string>
+	<string name="RELEASE_NOTES_BASE_URL" translate="false">http://wiki.firestormviewer.org/firestorm_change_log_</string>
 
 	<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
 	<string name="LoadingData">Loading...</string>
diff --git a/indra/newview/skins/default/xui/es/floater_media_browser.xml b/indra/newview/skins/default/xui/es/floater_media_browser.xml
index 249ff1b1c7..8e8eb59f2e 100644
--- a/indra/newview/skins/default/xui/es/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/es/floater_media_browser.xml
@@ -26,7 +26,7 @@
 			<text name="plugin_fail_text">
 				El conector del navegador web parece estar tardando en abrirse. Si no se termina de abrir, por favor visita:
 
-http://wiki.phoenixviewer.com/fs_media
+http://wiki.firestormviewer.org/fs_media
 
 para ver posibles formas de resolver este problema.
 			</text>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
index b6331ad69e..01d43ce076 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
@@ -3,7 +3,7 @@
 	<tab_container name="max_bandwidth_layout">
 		<panel label="Conexión" name="tab-conn">
 			<text name="Maximum bandwidth">
-				Ancho de banda máximo ([http://wiki.phoenixviewer.com/fs_speedtest qué necesita una sugerencia?]):
+				Ancho de banda máximo ([http://wiki.firestormviewer.org/fs_speedtest qué necesita una sugerencia?]):
 			</text>
 			<check_box label="Personalizar el puerto" name="connection_port_enabled"/>
 			<spinner label="Nº del puerto:" name="connection_port" width="160" label_width="85"/>
@@ -27,7 +27,7 @@
 		</panel>
 		<panel label="Directorio" name="tab-dir">
 			<text name="cache_size_label_l">
-				Tamaño de la caché ([http://wiki.phoenixviewer.com/cache necesita una sugerencia?]):
+				Tamaño de la caché ([http://wiki.firestormviewer.org/cache necesita una sugerencia?]):
 			</text>
 			<text name="Cache location">
 				Directorio de la caché:
diff --git a/indra/newview/skins/default/xui/fr/floater_media_browser.xml b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
index ed8f70c92f..aab9308355 100644
--- a/indra/newview/skins/default/xui/fr/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
@@ -19,7 +19,7 @@
 			<text name="plugin_fail_text">
  Le plugin du navigateur web semble mettre du temps à s'ouvrir.
  Si le plugin ne se charge pas, veuillez visiter :
- http://wiki.phoenixviewer.com/fs_media
+ http://wiki.firestormviewer.org/fs_media
  pour plus d'informations concernant ce problème.
 			</text>
 			<button label="Ouvrir dans mon navigateur web" name="open_browser"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_web_content.xml b/indra/newview/skins/default/xui/fr/floater_web_content.xml
index 70be56b139..a15e47fc91 100644
--- a/indra/newview/skins/default/xui/fr/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/fr/floater_web_content.xml
@@ -15,9 +15,9 @@
 Le plugin du navigateur semble mettre du temps à répondre
 
 Si le plugin ne se charge pas, veuillez consulter :
-http://wiki.phoenixviewer.com/fs_search_issues
+http://wiki.firestormviewer.org/fs_search_issues
 
-et/ou http://wiki.phoenixviewer.com/fs_media
+et/ou http://wiki.firestormviewer.org/fs_media
 
 pour plus d'informations concernant ce problème.
 			</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
index f6e8ddc0ae..0720418544 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
@@ -2,7 +2,7 @@
 <panel label="Initialisation" name="Input panel">
 	<tab_container name="max_bandwidth_layout" label="Initialisation">
 		<panel label="Connexion" name="tab-conn">
-			<text name="Maximum bandwidth">Bande passante maximale ([http://wiki.phoenixviewer.com/fs_speedtest Besoin d'aide ?]):</text>
+			<text name="Maximum bandwidth">Bande passante maximale ([http://wiki.firestormviewer.org/fs_speedtest Besoin d'aide ?]):</text>
 			<text name="text_box2">Kbps</text>
 			<text name="NetworkPrefText1">Wi-Fi</text>
 			<text name="NetworkPrefText2">DSL</text>
@@ -31,7 +31,7 @@
 			<button label="Configurer les paramètres proxy" label_selected="Configurer les paramètres proxy" name="set_proxy"/>
 		</panel>
 		<panel label="Dossiers" name="tab-dir">
-			<text name="cache_size_label_l">Taille du cache ([http://wiki.phoenixviewer.com/cache Besoin d'aide ?]) :</text>
+			<text name="cache_size_label_l">Taille du cache ([http://wiki.firestormviewer.org/cache Besoin d'aide ?]) :</text>
 			<text name="text_box5">Mo</text>
 			<button label="Vider le cache de l'inventaire" name="ClearInventoryCache" left="350" width="180"/>
 			<text name="Cache location">Emplacement du cache :</text>
diff --git a/indra/newview/skins/default/xui/it/floater_media_browser.xml b/indra/newview/skins/default/xui/it/floater_media_browser.xml
index b5cb341550..44afd65bde 100644
--- a/indra/newview/skins/default/xui/it/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/it/floater_media_browser.xml
@@ -20,7 +20,7 @@
 Il plugin per il contenuto web sta impiegando molto tempo ad aprirsi.
 Se non si carica, visitare:
 
-http://wiki.phoenixviewer.com/fs_media
+http://wiki.firestormviewer.org/fs_media
 
 per cercare di risolvere il problema.
 			</text>
diff --git a/indra/newview/skins/default/xui/it/floater_web_content.xml b/indra/newview/skins/default/xui/it/floater_web_content.xml
index 54cc80de94..45b265412a 100644
--- a/indra/newview/skins/default/xui/it/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/it/floater_web_content.xml
@@ -18,11 +18,11 @@
 Il plugin per il contenuto web sta impiegando molto tempo ad aprirsi.
 Se non si carica, visitare:
 
-http://wiki.phoenixviewer.com/fs_search_issues
+http://wiki.firestormviewer.org/fs_search_issues
 
 e
 
-http://wiki.phoenixviewer.com/fs_media
+http://wiki.firestormviewer.org/fs_media
 
 per cercare di risolvere il problema.
 			</text>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index b05c03b544..d30275cf32 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -3487,7 +3487,7 @@ Consigliamo di controllare le impostazioni di rete e del firewall.
 Disabilitare tutte le funzioni SIP ALG sul router.
 
 Le comunicazioni tramite voce non saranno disponibili.
-[https://wiki.phoenixviewer.com/fs_voice]
+[https://wiki.firestormviewer.org/fs_voice]
 		<usetemplate ignoretext="Avvisami quando non è possibile la connessione con il server voce" name="okignore"/>
 	</notification>
 	<notification name="NoVoiceConnect-GIAB">
@@ -3495,7 +3495,7 @@ Le comunicazioni tramite voce non saranno disponibili.
 
 Le comunicazioni tramite voce non saranno disponibili.
 Consigliamo di controllare le impostazioni di rete e del firewall.
-[https://wiki.phoenixviewer.com/fs_voice]
+[https://wiki.firestormviewer.org/fs_voice]
 	</notification>
 	<notification name="AvatarRezLeftNotification">
 		( presente da [EXISTENCE] secondi )
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
index 5bcb337b80..a07b9212d4 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
@@ -3,7 +3,7 @@
 	<tab_container name="max_bandwidth_layout">
 		<panel label="Rete" name="tab-conn">
 			<text name="Maximum bandwidth">
-				Capacità massima di banda ([http://wiki.phoenixviewer.com/fs_speedtest serve un consiglio?]):
+				Capacità massima di banda ([http://wiki.firestormviewer.org/fs_speedtest serve un consiglio?]):
 			</text>
 			<text name="NetworkPrefText1" >
 				Wi-Fi
@@ -45,7 +45,7 @@
 		</panel>
 		<panel label="Cartelle" name="tab-dir">
 			<text name="cache_size_label_l">
-				Dimensioni cache ([http://wiki.phoenixviewer.com/cache serve un consiglio?]):
+				Dimensioni cache ([http://wiki.firestormviewer.org/cache serve un consiglio?]):
 			</text>
 			<button label="Cancella cache inventario" name="ClearInventoryCache" left="350" width="150"/>
 			<text name="Cache location">
diff --git a/indra/newview/skins/default/xui/ja/floater_web_content.xml b/indra/newview/skins/default/xui/ja/floater_web_content.xml
index fdc8303f77..3a6c75e1fe 100644
--- a/indra/newview/skins/default/xui/ja/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/ja/floater_web_content.xml
@@ -23,11 +23,11 @@
 Webブラウザのプラグインが開くのに時間がかかっています。
 プラグインが全く読み込まれないようであれば、次のページを参考にしてみて下さい。
 
-http://wiki.phoenixviewer.com/fs_search_issues
+http://wiki.firestormviewer.org/fs_search_issues
 
 または
 
-http://wiki.phoenixviewer.com/fs_media
+http://wiki.firestormviewer.org/fs_media
 
 この問題を解決する有効な手順を探してみて下さい。
 			</text>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index fa94d0614e..1bb02aea9f 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -337,7 +337,7 @@
 		<menu_item_check label="ヒントを有効にする" name="Enable Hints"/>
 		<menu_item_call label="Firestorm Wiki" name="Firestorm Wiki"/>
 		<menu_item_call label="問題の解決" name="Troubleshooting">
-			<menu_item_call.on_click name="wiki_troubleshooting_url" parameter="WebLaunchExternalTarget,http://wiki.phoenixviewer.com/firestorm_troubleshooting" />
+			<menu_item_call.on_click name="wiki_troubleshooting_url" parameter="WebLaunchExternalTarget,http://wiki.firestormviewer.org/firestorm_troubleshooting" />
 		</menu_item_call>
 		
 		<menu_item_call label="Firestormサポートグループに参加" name="firestorm_support_group"/>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index ee9c2c8f55..1154743410 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -3816,12 +3816,12 @@ UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000
 お使いのルーターの SIP ALG 機能をすべて無効にしてください。
 
 ボイスチャットによるコミュニケーションが利用できません。
-[https://wiki.phoenixviewer.com/fs_voice]
+[https://wiki.firestormviewer.org/fs_voice]
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="NoVoiceConnect-GIAB">
 		ボイスサーバーに接続できません。ボイスチャットによるコミュニケーションが利用できません。お使いのネットワークやファイアウォールの設定を確認してください。
-[https://wiki.phoenixviewer.com/fs_voice]
+[https://wiki.firestormviewer.org/fs_voice]
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="AvatarRezLeftNotification">
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
index 59f4ee317a..15a03efeb0 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
@@ -8,7 +8,7 @@
 	<tab_container name="max_bandwidth_layout" label="セットアップ">
 		<panel label="接続" name="tab-conn">
 			<text name="Maximum bandwidth">
-				最大帯域幅 ([http://wiki.phoenixviewer.com/fs_speedtest 適正な値を設定するには？]):
+				最大帯域幅 ([http://wiki.firestormviewer.org/fs_speedtest 適正な値を設定するには？]):
 			</text>
 			<icon name="NetworkLowGraphicsDivet" />
 			<icon name="NetworkMidGraphicsDivet" />
@@ -64,7 +64,7 @@
 		
 		<panel label="ディレクトリ" name="tab-dir">
 			<text name="cache_size_label_l">
-				キャッシュサイズ ([http://wiki.phoenixviewer.com/cache 推奨設定を確認しますか？]):
+				キャッシュサイズ ([http://wiki.firestormviewer.org/cache 推奨設定を確認しますか？]):
 			</text>
 			<text name="text_box5">
 				MB
diff --git a/indra/newview/skins/default/xui/pl/floater_media_browser.xml b/indra/newview/skins/default/xui/pl/floater_media_browser.xml
index 31e7135acf..13f02d8666 100644
--- a/indra/newview/skins/default/xui/pl/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/pl/floater_media_browser.xml
@@ -19,7 +19,7 @@
 Wygląda na to, że wtyczka przeglądarki długo się otwiera.
 Jeśli plugin się wcale nie załaduje, to odwiedź:
 
-http://wiki.phoenixviewer.com/fs_media
+http://wiki.firestormviewer.org/fs_media
 
 aby poznać możliwe kroki naprawy błędu.
 			</text>
diff --git a/indra/newview/skins/default/xui/pl/floater_web_content.xml b/indra/newview/skins/default/xui/pl/floater_web_content.xml
index e614b1ea85..18b0029db7 100644
--- a/indra/newview/skins/default/xui/pl/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/pl/floater_web_content.xml
@@ -18,11 +18,11 @@
 Wygląda na to, że wtyczka przeglądarki długo się otwiera.
 Jeśli plugin się wcale nie załaduje, to odwiedź:
 
-http://wiki.phoenixviewer.com/fs_search_issues
+http://wiki.firestormviewer.org/fs_search_issues
 
 oraz
 
-http://wiki.phoenixviewer.com/fs_media
+http://wiki.firestormviewer.org/fs_media
 
 aby poznać możliwe kroki naprawy błędu.
 			</text>
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index ef1cb5d185..b44eb888de 100644
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -3468,7 +3468,7 @@ Porty, które muszą być otwarte dla połączeń głosowych, to:
 Proszę sprawdź swoją sieć i ustawienia firewall.
 Wyłącz wszelkie funkcjonalności SIP ALG (Application Layer Gateway) w swoim routerze.
 
-[https://wiki.phoenixviewer.com/fs_voice]
+[https://wiki.firestormviewer.org/fs_voice]
 		<usetemplate name="okignore" ignoretext="Ostrzegaj mnie, gdy przeglądarka nie może połączyć się z serwerem głosu" />
 	</notification>
 	<notification name="NoVoiceConnect-GIAB">
@@ -3477,7 +3477,7 @@ Wyłącz wszelkie funkcjonalności SIP ALG (Application Layer Gateway) w swoim r
 Komunikacja głosowa nie będzie dostępna.
 Proszę sprawdź swoją sieć i ustawienia firewall.
 
-[https://wiki.phoenixviewer.com/fs_voice]
+[https://wiki.firestormviewer.org/fs_voice]
 	</notification>
 	<notification name="AvatarRezLeftNotification">
 		( [EXISTENCE] sekund w Second Life)
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
index 4fbed0bce4..535245b137 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
@@ -3,7 +3,7 @@
 	<tab_container name="max_bandwidth_layout">
 		<panel label="Połączenie" name="tab-conn">
 			<text name="Maximum bandwidth">
-				Maksymalna przepustowość ([http://wiki.phoenixviewer.com/fs_speedtest potrzebujesz sugestii?]):
+				Maksymalna przepustowość ([http://wiki.firestormviewer.org/fs_speedtest potrzebujesz sugestii?]):
 			</text>
 			<text name="NetworkPrefText3">
 				Światłowód
@@ -41,7 +41,7 @@
 		</panel>
 		<panel label="Lokalizacje" name="tab-dir">
 			<text name="cache_size_label_l">
-				Rozmiar pamięci podręcznej ([http://wiki.phoenixviewer.com/cache potrzebujesz sugestii?]):
+				Rozmiar pamięci podręcznej ([http://wiki.firestormviewer.org/cache potrzebujesz sugestii?]):
 			</text>
 			<button label="Wyczyść bufor Szafy" name="ClearInventoryCache"/>
 			<text name="Cache location">
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
index 6a1f99d1e5..c763ea814a 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
@@ -3,7 +3,7 @@
 	<tab_container name="max_bandwidth_layout">
 		<panel label="Rede" name="tab-conn">
 			<text name="Maximum bandwidth">
-				Largura de banda máxima ([http://wiki.phoenixviewer.com/fs_speedtest você precisa de uma sugestão?]):
+				Largura de banda máxima ([http://wiki.firestormviewer.org/fs_speedtest você precisa de uma sugestão?]):
 			</text>
 			<check_box label="Personalizar porta" name="connection_port_enabled"/>
 			<spinner label="Número da porta:" name="connection_port" width="160" label_width="85"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
index 7edcbd592d..a1a40219cd 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
@@ -3,7 +3,7 @@
 	<tab_container name="max_bandwidth_layout">
 		<panel label="Подключение" name="tab-conn">
 			<text name="Maximum bandwidth">
-				Максимальная пропускная способность ([http://wiki.phoenixviewer.com/fs_speedtest Нужны подсказки?] (На английском)):
+				Максимальная пропускная способность ([http://wiki.firestormviewer.org/fs_speedtest Нужны подсказки?] (На английском)):
 			</text>
 			<text name="NetworkPrefText3">
 				Кабель
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
index 502a04d661..42ee5c0dbf 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
@@ -3,7 +3,7 @@
 	<tab_container name="max_bandwidth_layout">
 		<panel label="Ağ" name="tab-conn">
 			<text name="Maximum bandwidth">
-				Maksimum bant genişliği ([http://wiki.phoenixviewer.com/fs_speedtest Bir öneri gerekiyor?]):
+				Maksimum bant genişliği ([http://wiki.firestormviewer.org/fs_speedtest Bir öneri gerekiyor?]):
 			</text>
 			<check_box label="Özel port" name="connection_port_enabled"/>
 			<spinner label="Port numarası:" name="connection_port" width="160" label_width="85"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
index a00a59055c..e55004698c 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
@@ -3,7 +3,7 @@
 	<tab_container name="max_bandwidth_layout">
 		<panel label="網路" name="tab-conn">
 			<text name="Maximum bandwidth">
-				最大頻寬 ([http://wiki.phoenixviewer.com/fs_speedtest 你需要一个建议?]):
+				最大頻寬 ([http://wiki.firestormviewer.org/fs_speedtest 你需要一个建议?]):
 			</text>
 			<check_box label="自訂埠" name="connection_port_enabled"/>
 			<spinner label="埠號:" name="connection_port"/>

From b4ee78f573c7a3945befcc53fc5ef5509baeb18c Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <pantera.polnocy@phoenixviewer.com>
Date: Mon, 7 Oct 2019 10:00:37 +0200
Subject: [PATCH 86/97] Updated Polish translation, Startlight skins; Group
 panel header

---
 .../newview/skins/starlight/xui/pl/panel_group_info_sidetray.xml | 1 +
 .../skins/starlightcui/xui/pl/panel_group_info_sidetray.xml      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/indra/newview/skins/starlight/xui/pl/panel_group_info_sidetray.xml b/indra/newview/skins/starlight/xui/pl/panel_group_info_sidetray.xml
index 08594c8092..bdd1a0bce9 100644
--- a/indra/newview/skins/starlight/xui/pl/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/starlight/xui/pl/panel_group_info_sidetray.xml
@@ -27,6 +27,7 @@
 						<accordion_tab name="group_roles_tab" title="Funkcje i osoby"/>
 						<accordion_tab name="group_notices_tab" title="Ogłoszenia"/>
 						<accordion_tab name="group_land_tab" title="Działka/Majątek"/>
+						<accordion_tab name="group_experiences_tab" title="Przygody"/>
 					</accordion>
 				</layout_panel>
 			</layout_stack>
diff --git a/indra/newview/skins/starlightcui/xui/pl/panel_group_info_sidetray.xml b/indra/newview/skins/starlightcui/xui/pl/panel_group_info_sidetray.xml
index 08594c8092..bdd1a0bce9 100644
--- a/indra/newview/skins/starlightcui/xui/pl/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/starlightcui/xui/pl/panel_group_info_sidetray.xml
@@ -27,6 +27,7 @@
 						<accordion_tab name="group_roles_tab" title="Funkcje i osoby"/>
 						<accordion_tab name="group_notices_tab" title="Ogłoszenia"/>
 						<accordion_tab name="group_land_tab" title="Działka/Majątek"/>
+						<accordion_tab name="group_experiences_tab" title="Przygody"/>
 					</accordion>
 				</layout_panel>
 			</layout_stack>

From 16fc62c937e5df5031bcecadd244d6cde3ea4820 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 8 Oct 2019 19:04:03 +0200
Subject: [PATCH 87/97] Add missing RLVa check

---
 indra/newview/rlvcommon.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index d8fb85a7d5..4c138dc865 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -346,6 +346,11 @@ void RlvStrings::saveToFile(const std::string& strFilePath)
 // Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
 const std::string& RlvStrings::getAnonym(const std::string& strName)
 {
+	if (!rlv_handler_t::isEnabled())
+	{
+		return strName;
+	}
+
 	const char* pszName = strName.c_str(); U32 nHash = 0;
 	
 	// Test with 11,264 SL names showed a 3.33% - 3.82% occurance for each so we *should* get a very even spread

From 22c24e188a695cbbd64de11353d60a45527a9e5b Mon Sep 17 00:00:00 2001
From: ziree <none@none>
Date: Wed, 9 Oct 2019 21:06:41 +0200
Subject: [PATCH 88/97] Fix compiler warning for GCC 9 on Linux. Patch by Kitty
 Barnett

---
 indra/newview/rlvcommon.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index 4c138dc865..95e182bbd6 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -348,7 +348,8 @@ const std::string& RlvStrings::getAnonym(const std::string& strName)
 {
 	if (!rlv_handler_t::isEnabled())
 	{
-		return strName;
+		static std::string strNobody = LLTrans::getString("AvatarNameNobody");
+		return strNobody;
 	}
 
 	const char* pszName = strName.c_str(); U32 nHash = 0;

From 1d94fc7ce60ff37fcef4e22e6db73b4532377e9c Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Wed, 9 Oct 2019 22:32:19 +0200
Subject: [PATCH 89/97] Change function signature of getAnonym to return
 std::string rather than reference and do not return "nobody" in case RLVa is
 disabled.

---
 indra/integration_tests/llui_libtest/llui_libtest.cpp | 2 +-
 indra/llui/llurlentry.cpp                             | 2 +-
 indra/llui/tests/llurlentry_stub.cpp                  | 2 +-
 indra/newview/rlvcommon.cpp                           | 9 +++------
 indra/newview/rlvcommon.h                             | 6 +++---
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/indra/integration_tests/llui_libtest/llui_libtest.cpp b/indra/integration_tests/llui_libtest/llui_libtest.cpp
index acf5816f48..d8209f0931 100644
--- a/indra/integration_tests/llui_libtest/llui_libtest.cpp
+++ b/indra/integration_tests/llui_libtest/llui_libtest.cpp
@@ -56,7 +56,7 @@ LLControlGroup gWarningSettings("Warnings"); // persists ignored dialogs/warning
 #include "llavatarname.h"
 
 // Stub for rlvGetAnonym
-const std::string& rlvGetAnonym(const LLAvatarName& avName)
+std::string rlvGetAnonym(const LLAvatarName& avName)
 {
 	static std::string strAnonym = "A resident";
 	return strAnonym;
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 82f2a74830..25afe6eee5 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -929,7 +929,7 @@ std::string LLUrlEntryAgentUserName::getName(const LLAvatarName& avatar_name)
 // [RLVa:KB] - Checked: 2010-11-01 (RLVa-1.2.2a) | Added: RLVa-1.2.2a
 
 // Defined in rlvcommon.cpp - redirects to RlvStrings::getAnonym() since we can't really get to that class from here
-extern const std::string& rlvGetAnonym(const LLAvatarName& avName);
+extern std::string rlvGetAnonym(const LLAvatarName& avName);
 
 //
 // LLUrlEntryAgentRLVAnonymizedName Describes an RLV anonymized agent name Url, e.g.,
diff --git a/indra/llui/tests/llurlentry_stub.cpp b/indra/llui/tests/llurlentry_stub.cpp
index 36aa316696..cdde80edd5 100755
--- a/indra/llui/tests/llurlentry_stub.cpp
+++ b/indra/llui/tests/llurlentry_stub.cpp
@@ -37,7 +37,7 @@
 
 // [RLVa:KB] - Checked: 2010-11-12 (RLVa-1.2.2a) | Added: RLVa-1.2.2a
 // Stub for rlvGetAnonym
-const std::string& rlvGetAnonym(const LLAvatarName& avName)
+std::string rlvGetAnonym(const LLAvatarName& avName)
 {
 	static std::string strAnonym = "A resident";
 	return strAnonym;
diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index 95e182bbd6..9eaea8d394 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -344,13 +344,10 @@ void RlvStrings::saveToFile(const std::string& strFilePath)
 }
 
 // Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
-const std::string& RlvStrings::getAnonym(const std::string& strName)
+std::string RlvStrings::getAnonym(const std::string& strName)
 {
 	if (!rlv_handler_t::isEnabled())
-	{
-		static std::string strNobody = LLTrans::getString("AvatarNameNobody");
-		return strNobody;
-	}
+		return strName;
 
 	const char* pszName = strName.c_str(); U32 nHash = 0;
 	
@@ -912,7 +909,7 @@ BOOL rlvEnableSharedWearEnabler(void* pParam)
 */
 
 // Checked: 2010-11-01 (RLVa-1.2.2a) | Added: RLVa-1.2.2a
-const std::string& rlvGetAnonym(const LLAvatarName& avName)
+std::string rlvGetAnonym(const LLAvatarName& avName)
 {
 	return RlvStrings::getAnonym(avName);
 }
diff --git a/indra/newview/rlvcommon.h b/indra/newview/rlvcommon.h
index c224fcbf6c..50dc08283f 100644
--- a/indra/newview/rlvcommon.h
+++ b/indra/newview/rlvcommon.h
@@ -145,8 +145,8 @@ public:
 	static void loadFromFile(const std::string& strFilePath, bool fDefault);
 	static void saveToFile(const std::string& strFilePath);
 
-	static const std::string& getAnonym(const LLAvatarName& avName);		// @shownames
-	static const std::string& getAnonym(const std::string& strName);		// @shownames
+	static std::string getAnonym(const LLAvatarName& avName);		// @shownames
+	static std::string getAnonym(const std::string& strName);		// @shownames
 	static const std::string& getString(const std::string& strStringName);
 	static const char*        getStringFromReturnCode(ERlvCmdRet eRet);
 	static const std::string& getStringMapPath() { return m_StringMapPath; }
@@ -307,7 +307,7 @@ template<typename T> struct RlvPredValuesEqual
 //
 
 // Checked: 2010-10-31 (RLVa-1.2.2a) | Added: RLVa-1.2.2a
-inline const std::string& RlvStrings::getAnonym(const LLAvatarName& avName)
+inline std::string RlvStrings::getAnonym(const LLAvatarName& avName)
 {
 	return getAnonym(avName.getLegacyName());
 }

From 478630d3380c24e757f001f601d5381cd34b577d Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Wed, 9 Oct 2019 22:37:13 +0200
Subject: [PATCH 90/97] Pull out local var to make sure it's lifetime (and thus
 the internal c_str() pointer) is longer than the if block.

---
 indra/newview/fsdiscordconnect.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/fsdiscordconnect.cpp b/indra/newview/fsdiscordconnect.cpp
index 4aa9921578..a4c8167ed4 100644
--- a/indra/newview/fsdiscordconnect.cpp
+++ b/indra/newview/fsdiscordconnect.cpp
@@ -206,10 +206,10 @@ void FSDiscordConnect::updateRichPresence()
 	memset(&discordPresence, 0, sizeof(discordPresence));
 	discordPresence.state = region_name.c_str();
 
+	std::string name;
 	if (RlvActions::canShowName(RlvActions::SNC_DEFAULT, gAgentID) && gSavedPerAccountSettings.getBOOL("FSShareNameToDiscord"))
 	{
 		LLAvatarName av_name;
-		std::string name;
 		if (LLAvatarNameCache::get(gAgentID, &av_name))
 		{
 			name = av_name.getCompleteName(true, true);

From f3855085f5e11280d7516761d34059034b112afa Mon Sep 17 00:00:00 2001
From: Nicky <sl.nicky.ml@googlemail.com>
Date: Sat, 12 Oct 2019 06:59:39 +0200
Subject: [PATCH 91/97] FIRE-23370 / Linux; cache optimize volume faces again
 without destroying the triangle mesh.

---
 indra/llmath/llvolume.cpp | 52 ++++++++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 15 deletions(-)

diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index abad9eb7e1..085c5c5df6 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -5293,22 +5293,15 @@ bool LLVolumeFace::cacheOptimize()
 	// LLVCacheVertexData suddenly does point to unrelated vertices. It is an interesting fact that this is no problem for the
 	// windows version.
 	//
-	// To solve the issue with the pointer invalidation it would make sense to use a std::vector< U16 > for triangle indices, sort this
-	// using
+	// To solve the issue with the pointer invalidation it use a std::vector< U16 > for triangle indices, sort this using
 	// std::sort( v.begin(), v.end(), [&triangle_data](U16 rhs, U16 lhs ){ return triangle_data[rhs].mScore > triangle_data[lhs].mScore; }
 	// Then access all LLVCacheTriangleData> via triangle_data[ v[ idx ] ].
 	//
-	// This will help indeed with the destroyed triangles; but the result will still not be perfect and there are problems with alpha due to
-	// what looks like z order.
-	//
-	// It is peculiar that none of this happens when compiling with MSVC.
-	// Sadly for Linux it seems to be a decision between two evils
-	// - Disable cacheOptimize and have correct meshes but potentially a bit of less FPS.
-	// - Enable/fix cacheOptimize, potentially have a bit higher FPS but broken meshes.
-	//
-	// Having meshes correctly seems to be a bit of a lesser evil. Then do some wider testing on different systems to test for any other potential sideeffects.
+	// Unfortunately this is a bit of a messy interwoven change all of this method, alternative is to copy a Linux specific version. Which
+	// won't be that great either
+	// NB The change really should be safe for Winows too, in fact it is surprising Windows does not suffer fro the sae bug. Just cannot test
+	// the windows versions right now.
 	
-#ifndef LL_LINUX
 	LLVCacheLRU cache;
 	
 	if (mNumVertices < 3)
@@ -5343,6 +5336,13 @@ bool LLVolumeFace::cacheOptimize()
 		triangle_data[tri_idx].mVertex[i%3] = &(vertex_data[idx]);
 	}
 
+// <FS:ND> FIRE-23370/BUG-8801/MAIN-5060
+#ifdef LL_LINUX
+	std::vector< U16 > v;
+	for (U32 j = 0; j < triangle_data.size(); ++j)
+		v.push_back( j );
+#endif
+	
 	/*F32 pre_acmr = 1.f;
 	//measure cache misses from before rebuild
 	{
@@ -5374,14 +5374,28 @@ bool LLVolumeFace::cacheOptimize()
 	}
 
 	//sort triangle data by score
+// <FS:ND> FIRE-23370/BUG-8801/MAIN-5060
+#ifndef LL_LINUX
 	std::sort(triangle_data.begin(), triangle_data.end());
-
+#else
+	std::sort( v.begin(), v.end(),
+			   [&triangle_data](U16 rhs, U16 lhs )
+			   { return triangle_data[rhs].mScore > triangle_data[lhs].mScore; }
+			   );
+#endif
+		
 	std::vector<U16> new_indices;
 
 	LLVCacheTriangleData* tri;
 
 	//prime pump by adding first triangle to cache;
+// <FS:ND> FIRE-23370/BUG-8801/MAIN-5060
+#ifndef LL_LINUX
 	tri = &(triangle_data[0]);
+#else
+	tri = &(triangle_data[v[0]]);
+#endif
+	
 	cache.addTriangle(tri);
 	new_indices.push_back(tri->mVertex[0]->mIdx);
 	new_indices.push_back(tri->mVertex[1]->mIdx);
@@ -5398,11 +5412,21 @@ bool LLVolumeFace::cacheOptimize()
 			breaks++;
 			for (U32 j = 0; j < triangle_data.size(); ++j)
 			{
+// <FS:ND> FIRE-23370/BUG-8801/MAIN-5060
+#ifndef LL_LINUX
 				if (triangle_data[j].mActive)
 				{
 					tri = &(triangle_data[j]);
 					break;
 				}
+#else
+				if (triangle_data[v[j]].mActive)
+				{
+					tri = &(triangle_data[v[j]]);
+					break;
+				}
+#endif
+
 			}
 		}	
 		
@@ -5534,8 +5558,6 @@ bool LLVolumeFace::cacheOptimize()
 	//std::string result = llformat("ACMR pre/post: %.3f/%.3f  --  %d triangles %d breaks", pre_acmr, post_acmr, mNumIndices/3, breaks);
 	//LL_INFOS() << result << LL_ENDL;
 
-#endif // <FS:ND/>
-
 	return true;
 }
 

From 191b935274f6109714ab6588f76d1f19ff61c8e6 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 13 Oct 2019 14:47:03 +0200
Subject: [PATCH 92/97] Update FMOD Studio to 2.00.05 on Windows

---
 autobuild.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 08cbce851a..0c7d075064 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1086,11 +1086,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>a0d1821154e7ce5c418e3cdc2f26f3fc</string>
+              <string>c668bd6961489c9bd6f07f1203a9d6eb</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.00.03-windows-192171947.tar.bz2</string>
+              <string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.00.05-windows-192861134.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -1100,18 +1100,18 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>b98d2da1ed02f8ba218de414a83d0edc</string>
+              <string>2cf52c44f8943f69b91c950ae7ea356a</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.00.03-windows64-192171948.tar.bz2</string>
+              <string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.00.05-windows64-192861136.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>2.00.03</string>
+        <string>2.00.05</string>
       </map>
       <key>fmodex</key>
       <map>

From 84d7c832cb8d680a5d13fdc2205c32343448b48d Mon Sep 17 00:00:00 2001
From: Nicky <sl.nicky.ml@googlemail.com>
Date: Sun, 13 Oct 2019 18:50:32 +0200
Subject: [PATCH 93/97] Make indices 32 bit to avoid overflows.

---
 indra/llmath/llvolume.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 085c5c5df6..33f03aed39 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -5338,7 +5338,7 @@ bool LLVolumeFace::cacheOptimize()
 
 // <FS:ND> FIRE-23370/BUG-8801/MAIN-5060
 #ifdef LL_LINUX
-	std::vector< U16 > v;
+	std::vector< U32 > v;
 	for (U32 j = 0; j < triangle_data.size(); ++j)
 		v.push_back( j );
 #endif

From 391a2c45980a62636c586a8fe0e69088758eb9ec Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Sun, 13 Oct 2019 22:36:07 +0200
Subject: [PATCH 94/97] Linux/Mac: FMOD Studio 2.00.05

---
 autobuild.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 0c7d075064..affb9384ed 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1058,11 +1058,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>0fcdc89c60271eda1fb37879b0c4a373</string>
+              <string>d892f61440dd1888327d764b04158c88</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>file:///opt/firestorm/fmodstudio-2.00.03-darwin-192401637.tar.bz2</string>
+              <string>file:///opt/firestorm/fmodstudio-2.00.05-darwin-192862021.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
@@ -1072,11 +1072,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>09f22b6a3ac41739073418bb6b8544d6</string>
+              <string>4bf66af7313c2a859bde553a563698e3</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>file:///opt/firestorm/fmodstudio-2.00.03-linux64-192401637.tar.bz2</string>
+              <string>file:///opt/firestorm/fmodstudio-2.00.05-linux64-192862026.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux64</string>

From b26bdc8987ee4149a35a6c5bd3d2b4ae41270e6a Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 15 Oct 2019 13:27:53 -0400
Subject: [PATCH 95/97] Added tag 6.3.2-release for changeset 07f5d5bc9fae

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index a4fb6ce9f8..75ece0c9b4 100755
--- a/.hgtags
+++ b/.hgtags
@@ -553,3 +553,4 @@ ab2ec5c5423b277d23fd0511ce50c15123ff2e03 6.2.3-release
 67297f9902857e357570c44722ad84de3aff974e 6.2.4-release
 9777aec6dc4a30a24537297ac040861ce16b82ae 6.3.0-release
 ece699718f163921717bb95a6131e94af4c4138f 6.3.1-release
+07f5d5bc9faebb45695853d40a9549773db816c0 6.3.2-release

From 33821bd599d1d9171cc93c38a2bc6c4ab6772c9a Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 15 Oct 2019 13:27:53 -0400
Subject: [PATCH 96/97] increment viewer version to 6.3.3

---
 indra/newview/VIEWER_VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 91e4a9f262..7849b73dc7 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-6.3.2
+6.3.3

From 0bbccb1cda1af4084664f83426cdf3fe3153ca7f Mon Sep 17 00:00:00 2001
From: ziree <none@none>
Date: Fri, 18 Oct 2019 01:55:58 +0200
Subject: [PATCH 97/97] Make FS AO animation transitions smoother by avoiding
 double starts and stops of motions

---
 indra/newview/llvoavatar.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 60605c4ce2..78acc61b19 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -6454,6 +6454,11 @@ BOOL LLVOAvatar::startMotion(const LLUUID& id, F32 time_offset)
 		else
 		{
 			gAgent.sendAnimationRequest(remap_id, ANIM_REQUEST_START);
+
+			// since we did an override, there is no need to do anything else,
+			// specifically not the startMotion() part at the bottom of this function
+			// See FIRE-29020
+			return true;
 		}
 	}
 	else
@@ -6495,6 +6500,11 @@ BOOL LLVOAvatar::stopMotion(const LLUUID& id, BOOL stop_immediate)
 		else
 		{
 			gAgent.sendAnimationRequest(remap_id, ANIM_REQUEST_STOP);
+
+			// since we did an override, there is no need to do anything else,
+			// specifically not the stopMotion() part at the bottom of this function
+			// See FIRE-29020
+			return true;
 		}
 	}
 	else