From 168d177197bd7558bbe0ca13d01c984ad8638da7 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Tue, 9 Mar 2021 14:39:51 -0800
Subject: This set of changes reverts the merge with master (git revert
 c83e740) and results in a version of the DRTVWR-519 that matches what was
 presemt before it was deployed as a release viewer *plus* 3 small fixes from
 Maxim (See commits).  This branch can now be used for additional fixes before
 eventually being used to release D-519 as normal

---
 indra/newview/skins/default/xui/da/floater_stats.xml            | 1 -
 indra/newview/skins/default/xui/da/strings.xml                  | 3 ---
 indra/newview/skins/default/xui/de/floater_scene_load_stats.xml | 1 -
 indra/newview/skins/default/xui/de/floater_stats.xml            | 1 -
 indra/newview/skins/default/xui/de/strings.xml                  | 4 ----
 indra/newview/skins/default/xui/en/floater_scene_load_stats.xml | 6 ------
 indra/newview/skins/default/xui/en/floater_stats.xml            | 4 ----
 indra/newview/skins/default/xui/en/strings.xml                  | 5 ++---
 indra/newview/skins/default/xui/es/floater_scene_load_stats.xml | 1 -
 indra/newview/skins/default/xui/es/floater_stats.xml            | 1 -
 indra/newview/skins/default/xui/es/strings.xml                  | 4 ----
 indra/newview/skins/default/xui/fr/floater_scene_load_stats.xml | 1 -
 indra/newview/skins/default/xui/fr/floater_stats.xml            | 1 -
 indra/newview/skins/default/xui/fr/strings.xml                  | 4 ----
 indra/newview/skins/default/xui/it/floater_scene_load_stats.xml | 1 -
 indra/newview/skins/default/xui/it/floater_stats.xml            | 1 -
 indra/newview/skins/default/xui/it/strings.xml                  | 4 ----
 indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml | 1 -
 indra/newview/skins/default/xui/ja/floater_stats.xml            | 1 -
 indra/newview/skins/default/xui/ja/strings.xml                  | 4 ----
 indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml | 1 -
 indra/newview/skins/default/xui/pl/floater_stats.xml            | 1 -
 indra/newview/skins/default/xui/pl/strings.xml                  | 3 ---
 indra/newview/skins/default/xui/pt/floater_scene_load_stats.xml | 1 -
 indra/newview/skins/default/xui/pt/floater_stats.xml            | 1 -
 indra/newview/skins/default/xui/pt/strings.xml                  | 4 ----
 indra/newview/skins/default/xui/ru/floater_scene_load_stats.xml | 1 -
 indra/newview/skins/default/xui/ru/floater_stats.xml            | 1 -
 indra/newview/skins/default/xui/ru/strings.xml                  | 4 ----
 indra/newview/skins/default/xui/tr/floater_scene_load_stats.xml | 1 -
 indra/newview/skins/default/xui/tr/floater_stats.xml            | 1 -
 indra/newview/skins/default/xui/tr/strings.xml                  | 4 ----
 indra/newview/skins/default/xui/zh/floater_scene_load_stats.xml | 1 -
 indra/newview/skins/default/xui/zh/floater_stats.xml            | 1 -
 indra/newview/skins/default/xui/zh/strings.xml                  | 4 ----
 35 files changed, 2 insertions(+), 76 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/da/floater_stats.xml b/indra/newview/skins/default/xui/da/floater_stats.xml
index fe3fa9626e..d07f9e48ca 100644
--- a/indra/newview/skins/default/xui/da/floater_stats.xml
+++ b/indra/newview/skins/default/xui/da/floater_stats.xml
@@ -32,7 +32,6 @@
 					<stat_bar label="Layers" name="layerskbitstat"/>
 					<stat_bar label="Actual In" name="actualinkbitstat"/>
 					<stat_bar label="Actual Out" name="actualoutkbitstat"/>
-					<stat_bar label="VFS Pending Ops" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="Simulator" name="sim">
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index ec6ba4800d..814305c1bc 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -22,9 +22,6 @@
 	<string name="StartupInitializingTextureCache">
 		Initialiserer tekstur cache...
 	</string>
-	<string name="StartupInitializingVFS">
-		Initialiserer VFS...
-	</string>
 	<string name="ProgressRestoring">
 		Gendanner...
 	</string>
diff --git a/indra/newview/skins/default/xui/de/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/de/floater_scene_load_stats.xml
index dff462a594..a3749f1cfa 100644
--- a/indra/newview/skins/default/xui/de/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/de/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
 					<stat_bar label="Ebenen" name="layersdatareceived"/>
 					<stat_bar label="Tatsächlicher Eingang" name="messagedatain"/>
 					<stat_bar label="Tatsächlicher Ausgang" name="messagedataout"/>
-					<stat_bar label="Ausstehende Vorgänge im VFS" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="Simulator" name="sim">
diff --git a/indra/newview/skins/default/xui/de/floater_stats.xml b/indra/newview/skins/default/xui/de/floater_stats.xml
index 4e6f56cd94..1838c2081a 100644
--- a/indra/newview/skins/default/xui/de/floater_stats.xml
+++ b/indra/newview/skins/default/xui/de/floater_stats.xml
@@ -56,7 +56,6 @@
 					<stat_bar label="Ebenen" name="layersdatareceived"/>
 					<stat_bar label="Tatsächlicher Eingang" name="messagedatain"/>
 					<stat_bar label="Tatsächlicher Ausgang" name="messagedataout"/>
-					<stat_bar label="Ausstehende Vorgänge im VFS" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="Simulator" name="sim">
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 43327c132d..f021e03dc7 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -31,9 +31,6 @@
 	<string name="StartupInitializingTextureCache">
 		Textur-Cache wird initialisiert...
 	</string>
-	<string name="StartupInitializingVFS">
-		VFS wird initialisiert...
-	</string>
 	<string name="StartupRequireDriverUpdate">
 		Grafikinitialisierung fehlgeschlagen. Bitte aktualisieren Sie Ihren Grafiktreiber.
 	</string>
@@ -73,7 +70,6 @@ LOD-Faktor: [LOD_FACTOR]
 Darstellungsqualität: [RENDER_QUALITY]
 Erweitertes Beleuchtungsmodell: [GPU_SHADERS]
 Texturspeicher: [TEXTURE_MEMORY] MB
-Erstellungszeit VFS (Cache): [VFS_TIME]
 	</string>
 	<string name="AboutOSXHiDPI">
 		HiDPI-Anzeigemodus: [HIDPI]
diff --git a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
index 62cce3a1e3..35d4385487 100644
--- a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
@@ -206,12 +206,6 @@
                     bar_max="1024.f"
                     tick_spacing="128.f"
                     precision="1"
-                    show_bar="false"/>
-			    <stat_bar name="vfspendingoperations"
-                    label="VFS Pending Operations"
-                    orientation="horizontal"
-                    stat="vfspendingoperations"
-                    unit_label=" Ops."
                     show_bar="false"/>
 			  </stat_view>
 		  </stat_view>
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index e4f735740b..f9d44b2c69 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -198,10 +198,6 @@
                     stat="messagedataout"
                     decimal_digits="1"
                     show_history="false"/>
-          <stat_bar name="vfspendingoperations"
-                    label="VFS Pending Operations"
-                    stat="vfspendingoperations"
-                    unit_label="Ops."/>
         </stat_view>
       </stat_view>
 
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f9f12e7f5c..619c869a3d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -17,7 +17,6 @@
 	<string name="StartupLoading">Loading [APP_NAME]...</string>
 	<string name="StartupClearingCache">Clearing cache...</string>
 	<string name="StartupInitializingTextureCache">Initializing texture cache...</string>
-	<string name="StartupInitializingVFS">Initializing VFS...</string>
 	<string name="StartupRequireDriverUpdate">Graphics initialization failed. Please update your graphics driver!</string>
 
 	<!-- about dialog/support string-->
@@ -56,9 +55,9 @@ LOD factor: [LOD_FACTOR]
 Render quality: [RENDER_QUALITY]
 Advanced Lighting Model: [GPU_SHADERS]
 Texture memory: [TEXTURE_MEMORY]MB
-VFS (cache) creation time: [VFS_TIME]
+Disk cache: [DISK_CACHE_INFO]
 	</string>
-	<string name="AboutOSXHiDPI">
+  <string name="AboutOSXHiDPI">
 HiDPI display mode: [HIDPI]
 	</string>
 	<string name="AboutLibs">
diff --git a/indra/newview/skins/default/xui/es/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/es/floater_scene_load_stats.xml
index f625d5257c..cfc5e524b5 100644
--- a/indra/newview/skins/default/xui/es/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/es/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
 					<stat_bar label="Capas" name="layersdatareceived"/>
 					<stat_bar label="Entrando ahora" name="messagedatain"/>
 					<stat_bar label="Saliendo ahora" name="messagedataout"/>
-					<stat_bar label="Operaciones VFS pendientes" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="Simulador" name="sim">
diff --git a/indra/newview/skins/default/xui/es/floater_stats.xml b/indra/newview/skins/default/xui/es/floater_stats.xml
index d1c5e867db..0aec786f25 100644
--- a/indra/newview/skins/default/xui/es/floater_stats.xml
+++ b/indra/newview/skins/default/xui/es/floater_stats.xml
@@ -56,7 +56,6 @@
 					<stat_bar label="Capas" name="layersdatareceived"/>
 					<stat_bar label="Entrando ahora" name="messagedatain"/>
 					<stat_bar label="Saliendo ahora" name="messagedataout"/>
-					<stat_bar label="Operaciones VFS pendientes" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="Simulador" name="sim">
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index f5e7d0bf4e..ebb4ceaa7e 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -22,9 +22,6 @@
 	<string name="StartupInitializingTextureCache">
 		Iniciando la caché de las texturas...
 	</string>
-	<string name="StartupInitializingVFS">
-		Iniciando VFS...
-	</string>
 	<string name="StartupRequireDriverUpdate">
 		Error de inicialización de gráficos. Actualiza tu controlador de gráficos.
 	</string>
@@ -65,7 +62,6 @@ Factor LOD: [LOD_FACTOR]
 Calidad de renderización: [RENDER_QUALITY]
 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]
diff --git a/indra/newview/skins/default/xui/fr/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/fr/floater_scene_load_stats.xml
index 62830054bf..3889b13f0c 100644
--- a/indra/newview/skins/default/xui/fr/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/fr/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
 					<stat_bar label="Couches" name="layersdatareceived"/>
 					<stat_bar label="Arrivés" name="messagedatain"/>
 					<stat_bar label="Sortis" name="messagedataout"/>
-					<stat_bar label="Opérations VFS en attente" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="Simulateur" name="sim">
diff --git a/indra/newview/skins/default/xui/fr/floater_stats.xml b/indra/newview/skins/default/xui/fr/floater_stats.xml
index fae17e3608..d0f7f42939 100644
--- a/indra/newview/skins/default/xui/fr/floater_stats.xml
+++ b/indra/newview/skins/default/xui/fr/floater_stats.xml
@@ -56,7 +56,6 @@
 					<stat_bar label="Couches" name="layersdatareceived"/>
 					<stat_bar label="Arrivés" name="messagedatain"/>
 					<stat_bar label="Sortis" name="messagedataout"/>
-					<stat_bar label="Opérations VFS en attente" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="Simulateur" name="sim">
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index f26eac545a..9fde703d6c 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -31,9 +31,6 @@
 	<string name="StartupInitializingTextureCache">
 		Initialisation du cache des textures...
 	</string>
-	<string name="StartupInitializingVFS">
-		Initialisation VFS...
-	</string>
 	<string name="StartupRequireDriverUpdate">
 		Échec d&apos;initialisation des graphiques. Veuillez mettre votre pilote graphique à jour.
 	</string>
@@ -74,7 +71,6 @@ Facteur LOD (niveau de détail) : [LOD_FACTOR]
 Qualité de rendu : [RENDER_QUALITY]
 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]
diff --git a/indra/newview/skins/default/xui/it/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/it/floater_scene_load_stats.xml
index ca18812eb7..efceb05298 100644
--- a/indra/newview/skins/default/xui/it/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/it/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
 					<stat_bar label="Livelli" name="layersdatareceived"/>
 					<stat_bar label="Effettivi in ingresso" name="messagedatain"/>
 					<stat_bar label="Effettivi in uscita" name="messagedataout"/>
-					<stat_bar label="Operazioni VFS in sospeso" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="Simulatore" name="sim">
diff --git a/indra/newview/skins/default/xui/it/floater_stats.xml b/indra/newview/skins/default/xui/it/floater_stats.xml
index 7ef13aa37f..6434c3b66b 100644
--- a/indra/newview/skins/default/xui/it/floater_stats.xml
+++ b/indra/newview/skins/default/xui/it/floater_stats.xml
@@ -56,7 +56,6 @@
 					<stat_bar label="Livelli" name="layersdatareceived"/>
 					<stat_bar label="Effettivi in ingresso" name="messagedatain"/>
 					<stat_bar label="Effettivi in uscita" name="messagedataout"/>
-					<stat_bar label="Operazioni VFS in sospeso" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="Simulatore" name="sim">
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index f0466cea81..3049828f46 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -28,9 +28,6 @@
 	<string name="StartupInitializingTextureCache">
 		Inizializzazione della cache texture...
 	</string>
-	<string name="StartupInitializingVFS">
-		Inizializzazione VFS...
-	</string>
 	<string name="StartupRequireDriverUpdate">
 		Inizializzazione grafica non riuscita. Aggiorna il driver della scheda grafica!
 	</string>
@@ -71,7 +68,6 @@ Fattore livello di dettaglio: [LOD_FACTOR]
 Qualità di rendering: [RENDER_QUALITY]
 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]
diff --git a/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
index f6edce026f..f348ce3c4d 100644
--- a/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
 					<stat_bar label="レイヤー" name="layersdatareceived"/>
 					<stat_bar label="実際の受信" name="messagedatain"/>
 					<stat_bar label="実際の送信" name="messagedataout"/>
-					<stat_bar label="VFS 保留中の操作" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="シミュレーター" name="sim">
diff --git a/indra/newview/skins/default/xui/ja/floater_stats.xml b/indra/newview/skins/default/xui/ja/floater_stats.xml
index 3bc343639b..1da0e5ebc9 100644
--- a/indra/newview/skins/default/xui/ja/floater_stats.xml
+++ b/indra/newview/skins/default/xui/ja/floater_stats.xml
@@ -56,7 +56,6 @@
 					<stat_bar label="レイヤー" name="layersdatareceived"/>
 					<stat_bar label="実際の受信" name="messagedatain"/>
 					<stat_bar label="実際の送信" name="messagedataout"/>
-					<stat_bar label="VFS 保留中の操作" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="シミュレーター" name="sim">
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 52d6fb0c2b..dcd6e65d34 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -31,9 +31,6 @@
 	<string name="StartupInitializingTextureCache">
 		テクスチャキャッシュを初期化中です...
 	</string>
-	<string name="StartupInitializingVFS">
-		VFS を初期化中です...
-	</string>
 	<string name="StartupRequireDriverUpdate">
 		グラフィックを初期化できませんでした。グラフィックドライバを更新してください。
 	</string>
@@ -74,7 +71,6 @@ LOD 係数: [LOD_FACTOR]
 描画の質: [RENDER_QUALITY]
 高度なライティングモデル: [GPU_SHADERS]
 テクスチャメモリ: [TEXTURE_MEMORY]MB
-VFS（キャッシュ）作成時間: [VFS_TIME]
 	</string>
 	<string name="AboutOSXHiDPI">
 		HiDPI 表示モード: [HIDPI]
diff --git a/indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml
index 6fdc7e19f6..8f5d0c5c70 100644
--- a/indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
 					<stat_bar name="layersdatareceived" label="Warstwy" />
 					<stat_bar name="messagedatain" label="Aktualna il. wchodząca" />
 					<stat_bar name="messagedataout" label="Aktualna il. wychodząca" />
-					<stat_bar name="vfspendingoperations" label="Operacje oczekujące VFS" unit_label=" op." />
 				</stat_view>
 			</stat_view>
 			<stat_view name="sim" label="Symulator">
diff --git a/indra/newview/skins/default/xui/pl/floater_stats.xml b/indra/newview/skins/default/xui/pl/floater_stats.xml
index 5dd7d19bab..21e37717c2 100644
--- a/indra/newview/skins/default/xui/pl/floater_stats.xml
+++ b/indra/newview/skins/default/xui/pl/floater_stats.xml
@@ -55,7 +55,6 @@
 					<stat_bar label="Warstwy" name="layersdatareceived" />
 					<stat_bar label="Aktualna il. wchodząca" name="messagedatain" />
 					<stat_bar label="Aktualna il. wychodząca" name="messagedataout" />
-					<stat_bar label="Operacje oczekujące VFS" name="vfspendingoperations" />
 				</stat_view>
 			</stat_view>
 			<stat_view label="Symulator" name="sim">
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 91fea234d2..cf033df3c9 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -15,9 +15,6 @@
 	<string name="StartupInitializingTextureCache">
 		Inicjowanie bufora danych tekstur...
 	</string>
-	<string name="StartupInitializingVFS">
-		Inicjowanie wirtualnego systemu plików...
-	</string>
 	<string name="StartupRequireDriverUpdate">
 		Nie można zainicjować grafiki. Zaktualizuj sterowniki!
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/pt/floater_scene_load_stats.xml
index 027e1ef311..dbaab1d782 100644
--- a/indra/newview/skins/default/xui/pt/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/pt/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
 					<stat_bar label="Layers" name="layersdatareceived"/>
 					<stat_bar label="Actual In" name="messagedatain"/>
 					<stat_bar label="Actual Out" name="messagedataout"/>
-					<stat_bar label="Operações pendentes do VFS" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="Simulator" name="sim">
diff --git a/indra/newview/skins/default/xui/pt/floater_stats.xml b/indra/newview/skins/default/xui/pt/floater_stats.xml
index f41fe17778..3253984268 100644
--- a/indra/newview/skins/default/xui/pt/floater_stats.xml
+++ b/indra/newview/skins/default/xui/pt/floater_stats.xml
@@ -56,7 +56,6 @@
 					<stat_bar label="Layers" name="layersdatareceived"/>
 					<stat_bar label="Actual In" name="messagedatain"/>
 					<stat_bar label="Actual Out" name="messagedataout"/>
-					<stat_bar label="Operações pendentes do VFS" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="Simulator" name="sim">
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index ee982b5b22..c72a41fd3a 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -22,9 +22,6 @@
 	<string name="StartupInitializingTextureCache">
 		Iniciando cache de texturas...
 	</string>
-	<string name="StartupInitializingVFS">
-		Iniciando VFS...
-	</string>
 	<string name="StartupRequireDriverUpdate">
 		Falha na inicialização dos gráficos. Atualize seu driver gráfico!
 	</string>
@@ -65,7 +62,6 @@ LOD fator: [LOD_FACTOR]
 Qualidade de renderização: [RENDER_QUALITY]
 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]
diff --git a/indra/newview/skins/default/xui/ru/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/ru/floater_scene_load_stats.xml
index a101e62627..c4f432023c 100644
--- a/indra/newview/skins/default/xui/ru/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/ru/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
 					<stat_bar label="Слои" name="layersdatareceived"/>
 					<stat_bar label="Действительный ввод" name="messagedatain"/>
 					<stat_bar label="Действительный вывод" name="messagedataout"/>
-					<stat_bar label="Ожидающие операции VFS" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="Симулятор" name="sim">
diff --git a/indra/newview/skins/default/xui/ru/floater_stats.xml b/indra/newview/skins/default/xui/ru/floater_stats.xml
index 10e9f5a7f4..a7d26029c2 100644
--- a/indra/newview/skins/default/xui/ru/floater_stats.xml
+++ b/indra/newview/skins/default/xui/ru/floater_stats.xml
@@ -56,7 +56,6 @@
 					<stat_bar label="Слои" name="layersdatareceived"/>
 					<stat_bar label="Действительный ввод" name="messagedatain"/>
 					<stat_bar label="Действительный вывод" name="messagedataout"/>
-					<stat_bar label="Ожидающие операции VFS" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="Симулятор" name="sim">
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index e9592a0476..43a87b2b18 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -31,9 +31,6 @@
 	<string name="StartupInitializingTextureCache">
 		Инициализация кэша текстур...
 	</string>
-	<string name="StartupInitializingVFS">
-		Инициализация виртуальной файловой системы...
-	</string>
 	<string name="StartupRequireDriverUpdate">
 		Ошибка инициализации графики. Обновите графический драйвер!
 	</string>
@@ -74,7 +71,6 @@ SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 Качество визуализации: [RENDER_QUALITY]
 Расширенная модель освещения: [GPU_SHADERS]
 Память текстур: [TEXTURE_MEMORY] МБ
-Время создания VFS (кэш): [VFS_TIME]
 	</string>
 	<string name="AboutOSXHiDPI">
 		Режим отображения HiDPI: [HIDPI]
diff --git a/indra/newview/skins/default/xui/tr/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/tr/floater_scene_load_stats.xml
index ae0a94595d..7d5f4adb02 100644
--- a/indra/newview/skins/default/xui/tr/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/tr/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
 					<stat_bar label="Katmanlar" name="layersdatareceived"/>
 					<stat_bar label="Gerçekte Gelen" name="messagedatain"/>
 					<stat_bar label="Gerçekte Giden" name="messagedataout"/>
-					<stat_bar label="VFS Bekleyen İşlemler" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="Simülatör" name="sim">
diff --git a/indra/newview/skins/default/xui/tr/floater_stats.xml b/indra/newview/skins/default/xui/tr/floater_stats.xml
index 1ae42ad382..bd36d4916f 100644
--- a/indra/newview/skins/default/xui/tr/floater_stats.xml
+++ b/indra/newview/skins/default/xui/tr/floater_stats.xml
@@ -56,7 +56,6 @@
 					<stat_bar label="Katmanlar" name="layersdatareceived"/>
 					<stat_bar label="Gerçekte Gelen" name="messagedatain"/>
 					<stat_bar label="Gerçekte Giden" name="messagedataout"/>
-					<stat_bar label="VFS Bekleyen İşlemler" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="Simülatör" name="sim">
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 56fad978f5..982de76a5b 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -31,9 +31,6 @@
 	<string name="StartupInitializingTextureCache">
 		Doku önbelleği başlatılıyor...
 	</string>
-	<string name="StartupInitializingVFS">
-		VFS Başlatılıyor...
-	</string>
 	<string name="StartupRequireDriverUpdate">
 		Grafik başlatma başarılamadı. Lütfen grafik sürücünüzü güncelleştirin!
 	</string>
@@ -74,7 +71,6 @@ LOD faktörü: [LOD_FACTOR]
 İşleme kalitesi: [RENDER_QUALITY]
 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]
diff --git a/indra/newview/skins/default/xui/zh/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/zh/floater_scene_load_stats.xml
index 1a5c20abeb..20344e299f 100644
--- a/indra/newview/skins/default/xui/zh/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/zh/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
 					<stat_bar label="層次" name="layersdatareceived"/>
 					<stat_bar label="實入" name="messagedatain"/>
 					<stat_bar label="實出" name="messagedataout"/>
-					<stat_bar label="VFS 待行作業" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="模擬器" name="sim">
diff --git a/indra/newview/skins/default/xui/zh/floater_stats.xml b/indra/newview/skins/default/xui/zh/floater_stats.xml
index f06eb5e78f..e233ece527 100644
--- a/indra/newview/skins/default/xui/zh/floater_stats.xml
+++ b/indra/newview/skins/default/xui/zh/floater_stats.xml
@@ -56,7 +56,6 @@
 					<stat_bar label="層次" name="layersdatareceived"/>
 					<stat_bar label="實入" name="messagedatain"/>
 					<stat_bar label="實出" name="messagedataout"/>
-					<stat_bar label="VFS 待行作業" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="模擬器" name="sim">
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index e6c61a5d94..3221cde3b7 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -31,9 +31,6 @@
 	<string name="StartupInitializingTextureCache">
 		正在初始化材質快取...
 	</string>
-	<string name="StartupInitializingVFS">
-		VFS 初始化中...
-	</string>
 	<string name="StartupRequireDriverUpdate">
 		顯像初始化失敗。 請更新你的顯像卡驅動程式！
 	</string>
@@ -74,7 +71,6 @@
 呈像品質：[RENDER_QUALITY]
 進階照明模型：[GPU_SHADERS]
 材質記憶體：[TEXTURE_MEMORY]MB
-VFS（快取）建立時間：[VFS_TIME]
 	</string>
 	<string name="AboutOSXHiDPI">
 		HiDPI顯示模式：[HIDPI]
-- 
cgit v1.2.3


From 0c89e67eb5bf2d82596d0c697831787cbbdf1e7f Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Fri, 20 Aug 2021 08:28:48 -0700
Subject: DRTVWR-534: Batch of modifications to 360 capture project after
 moving from internal repo to public one.

---
 .../html/common/equirectangular/default.html       |  22 +++
 .../html/common/equirectangular/eqr_gen.html       | 149 +++++++++++++++++++++
 indra/newview/skins/default/textures/textures.xml  |   3 +-
 .../default/textures/toolbar_icons/360_capture.png | Bin 0 -> 793 bytes
 .../skins/default/xui/en/floater_360capture.xml    | 124 +++++++++++++++++
 .../skins/default/xui/en/floater_snapshot.xml      |  22 ++-
 .../skins/default/xui/en/floater_toybox.xml        |  12 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml |  17 +++
 indra/newview/skins/default/xui/en/strings.xml     |   4 +
 9 files changed, 342 insertions(+), 11 deletions(-)
 create mode 100644 indra/newview/skins/default/html/common/equirectangular/default.html
 create mode 100644 indra/newview/skins/default/html/common/equirectangular/eqr_gen.html
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/360_capture.png
 create mode 100644 indra/newview/skins/default/xui/en/floater_360capture.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/html/common/equirectangular/default.html b/indra/newview/skins/default/html/common/equirectangular/default.html
new file mode 100644
index 0000000000..227b306590
--- /dev/null
+++ b/indra/newview/skins/default/html/common/equirectangular/default.html
@@ -0,0 +1,22 @@
+<html>
+<head>
+<style>
+body {
+  background-color:#000;
+  background-image: linear-gradient(white 2px, transparent 2px),
+  linear-gradient(90deg, white 2px, transparent 2px),
+  linear-gradient(rgba(255,255,255,.3) 1px, transparent 1px),
+  linear-gradient(90deg, rgba(255,255,255,.3) 1px, transparent 1px);
+  background-size: 100px 100px, 100px 100px, 20px 20px, 20px 20px;
+  background-position:-2px -2px, -2px -2px, -1px -1px, -1px -1px;
+}
+</style>
+</head>
+<body>
+<script>
+function start() {
+}
+document.addEventListener('DOMContentLoaded', start);
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/indra/newview/skins/default/html/common/equirectangular/eqr_gen.html b/indra/newview/skins/default/html/common/equirectangular/eqr_gen.html
new file mode 100644
index 0000000000..855c26c651
--- /dev/null
+++ b/indra/newview/skins/default/html/common/equirectangular/eqr_gen.html
@@ -0,0 +1,149 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
+    <style>
+        body {
+            background: #333;
+            padding: 0;
+            margin: 0;
+            overflow: hidden;
+        }
+        #error_message {
+            z-index: 2;
+            background-color: #aa3333;
+            overflow: hidden;
+            display:  none;
+            pointer-events:none;
+            font-family: monospace;
+            font-size: 3em;
+            color: white;
+            border-radius: 1em;
+            padding: 1em;
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            margin-right: -50%;
+            transform: translate(-50%, -50%)
+        }
+        #quality_window {
+            z-index: 100;
+            position:  absolute;
+            left: 8px;
+            top: 8px;
+            width: auto;
+            border-radius: 16px;
+            height: auto;
+            font-size: 1.5em;
+            text-align: center;
+            font-family: monospace;
+            background-color: rgba(200,200,200,0.35);
+            color: #000;
+            padding-left: 16px;
+            padding-right: 16px;
+            padding-top: 8px;
+            padding-bottom: 8px;
+        }
+    </style>
+</head>
+<body>
+    <script src="js/three.min.js"></script>
+    <script src="js/OrbitControls.js"></script>
+    <script src="js/jpeg_encoder_basic.js" type="text/javascript"></script>
+    <script src="js/CubemapToEquirectangular.js"></script>
+    <script>
+        var controls, camera, scene, renderer, equiManaged;
+
+        function init(eqr_width, eqr_height, img_path, camera_fov, initial_heading, overlay_label) {
+
+            camera = new THREE.PerspectiveCamera(camera_fov, window.innerWidth / window.innerHeight, 0.1, 100);
+            camera.position.x = 0.01;
+
+            scene = new THREE.Scene();
+
+            renderer = new THREE.WebGLRenderer();
+            renderer.autoClear = false;
+            renderer.setPixelRatio(window.devicePixelRatio);
+            renderer.setSize(window.innerWidth, window.innerHeight);
+
+            var cubemap_img_js_url = img_path + '/cubemap_img.js';
+            var cubemap_image_js = document.createElement('script');
+            cubemap_image_js.setAttribute('type', 'text/javascript');
+            cubemap_image_js.setAttribute('src', cubemap_img_js_url);
+            document.getElementsByTagName('head')[0].appendChild(cubemap_image_js);
+            cubemap_image_js.onload = function () {
+                document.getElementById("error_message").style.display = 'none' 
+                scene.background = new THREE.CubeTextureLoader().load(cubemap_img_js);
+                equiManaged = new CubemapToEquirectangular(renderer, true, eqr_width, eqr_height);
+            };
+            cubemap_image_js.onerror = function () {
+                document.getElementById("error_message").style.display = 'inline-block' 
+            };
+
+            document.body.appendChild(renderer.domElement);
+            window.addEventListener('resize', onWindowResize, false);
+
+            controls = new THREE.OrbitControls(camera, renderer.domElement);
+            controls.autoRotate = true;
+            controls.autoRotateSpeed = 0.2;
+            controls.enableZoom = false;
+            controls.enablePan = false;
+            controls.enableDamping = true;
+            controls.dampingFactor = 0.15;
+            controls.rotateSpeed = -0.5;
+
+            // initial direction the camera faces
+            // We cannot edit camera rotation directly as the OrbitControls will
+            // immediately reset it so we need some math to tell the controls
+            // there to look at initially. Note there is also an offset of π/2 since
+            // the Viewer and three.js have slightly different coordinate systems 
+            var spherical_target = new THREE.Spherical(1, Math.PI / 2, initial_heading + Math.PI / 2)
+            var target = new THREE.Vector3().setFromSpherical(spherical_target) 
+            camera.position.set(target.x, target.y, target.z);
+            controls.update();
+            controls.saveState();
+
+            // update the text that gets passed in from the C++ app for
+            // the translucent overlay label that tells us what we are seeing
+            document.getElementById('quality_window').innerHTML = overlay_label;
+
+            animate();
+        }
+
+        window.addEventListener(
+            'mousedown',
+            function (event) {
+                controls.autoRotate = false;
+            },
+            false
+        );
+
+        window.addEventListener(
+            'dblclick',
+            function (event) {
+                controls.autoRotate = true;
+            },
+            false
+        );
+
+        function saveAsEqrImage(filename, xmp_details) {
+            equiManaged.update(camera, scene, filename, xmp_details);
+        }
+
+        function onWindowResize() {
+            camera.aspect = window.innerWidth / window.innerHeight;
+            camera.updateProjectionMatrix();
+            renderer.setSize(window.innerWidth, window.innerHeight);
+        }
+
+        function animate() {
+            requestAnimationFrame(animate);
+            controls.update();
+            renderer.render(scene, camera);
+        }
+    </script>
+    <div id="error_message">UNABLE TO LOAD EQR IMAGE</div>
+    <div id="quality_window">Preview Quality</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 03878d9fe7..a36b859b6c 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -131,7 +131,8 @@ with the same filename but different name
   <texture name="Check_Mark" file_name="icons/check_mark.png" preload="true" />
 
   <texture name="Checker" file_name="checker.png" preload="false" />
-  
+
+  <texture name="Command_360_Capture_Icon"  file_name="toolbar_icons/360_capture.png"  preload="true" />
   <texture name="Command_AboutLand_Icon"    file_name="toolbar_icons/land.png"         preload="true" />
   <texture name="Command_Appearance_Icon"   file_name="toolbar_icons/appearance.png"   preload="true" />
   <texture name="Command_Avatar_Icon"       file_name="toolbar_icons/avatars.png"      preload="true" />
diff --git a/indra/newview/skins/default/textures/toolbar_icons/360_capture.png b/indra/newview/skins/default/textures/toolbar_icons/360_capture.png
new file mode 100644
index 0000000000..163cebe29f
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/360_capture.png differ
diff --git a/indra/newview/skins/default/xui/en/floater_360capture.xml b/indra/newview/skins/default/xui/en/floater_360capture.xml
new file mode 100644
index 0000000000..c2959b9853
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_360capture.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<floater can_resize="true"
+         height="400"
+         layout="topleft"
+         min_height="300"
+         min_width="400"
+         name="360capture"
+         help_topic="360capture"
+         save_rect="true"
+         title="360 Capture"
+         width="800">
+  <panel layout="topleft"
+       background_visible="true"
+       top="0"
+       follows="left|bottom|top"
+       left="0"
+       width="200"
+       bg_opaque_color="0.195 0.195 0.195 1"
+       background_opaque="true"
+       height="400"
+       name="ui_panel">
+    <text
+       follows="top|left|right"
+       height="16"
+       layout="topleft"
+       left="10"
+       top="10"
+       width="100">
+      Quality level
+    </text>
+    <radio_group
+      control_name="360QualitySelection"
+      follows="left|top"
+      height="94"
+      layout="topleft"
+      left_delta="20"
+      name="360_quality_selection"
+      top_pad="0"
+      width="180">
+      <radio_item
+        height="20"
+        label="Preview (fast)"
+        layout="topleft"
+        left="0"
+        name="preview_quality"
+        value="128"
+        tool_tip="Preview quality"
+        top="0"
+        width="100" />
+      <radio_item
+         height="20"
+         label="Medium"
+         layout="topleft"
+         left_delta="0"
+         name="medium_quality"
+         value="512"
+         tool_tip="Medium quality"
+         top_delta="20"
+         width="100" />
+      <radio_item
+         height="20"
+         label="High"
+         layout="topleft"
+         left_delta="0"
+         name="high_quality"
+         value="1024"
+         tool_tip="High quality"
+         top_delta="20"
+         width="100" />
+      <radio_item
+         height="20"
+         label="Maximum"
+         layout="topleft"
+         left_delta="0"
+         name="maximum_quality"
+         value="2048"
+         tool_tip="Maximum quality"
+         top_delta="20"
+         width="100" />
+    </radio_group>
+    <check_box control_name="360CaptureHideAvatars"
+               follows="left|top"
+               height="15"
+               label="Hide all avatars"
+               layout="left"
+               left="10"
+               name="360_hide_avatar"
+               top_delta="0"
+               width="100"/>
+    <button follows="left|top"
+            height="20"
+            label="Capture 360 image"
+            layout="topleft"
+            left="10"
+            name="capture_button"
+            top_delta="32"
+            width="180" />
+    <button follows="left|top"
+            height="20"
+            label="Save as.."
+            layout="topleft"
+            left="10"
+            name="save_local_button"
+            top_delta="35"
+            width="180" />
+  </panel>
+  <web_browser top="0"
+               follows="all"
+               bg_opaque_color="0.225 0.225 0.225 1"
+               left="200"
+               width="600"
+               height="380"
+               name="360capture_contents"
+               trusted_content="true" />
+  <text follows="bottom"
+        layout="topleft"
+        name="statusbar"
+        height="17"
+        left="210"
+        top="383"
+        width="600">
+       Click and drag on the image to pan
+  </text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 832c2ee7da..f441e3cbd7 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -400,7 +400,7 @@
    layout="topleft"
    name="img_info_border"
    top_pad="0"
-   right="-10"
+   right="-130"
    follows="left|top|right"
    left_delta="0"/>
    <text
@@ -411,11 +411,10 @@
     height="14"
     layout="topleft"
     left="220"
-	right="-20"
     halign="left"
     name="image_res_text"
     top_delta="5"
-    width="200">
+    width="250">
        [WIDTH]px (width) x [HEIGHT]px (height)
    </text>
    <text
@@ -423,7 +422,7 @@
     font="SansSerifSmall"
     height="14"
     layout="topleft"
-    left="-65"
+    left="-185"
     length="1"
     halign="right"
     name="file_size_label"
@@ -432,4 +431,19 @@
     width="50">
        [SIZE] KB
    </text>
+   <text
+    follows="right|top"
+    font="SansSerifSmall"
+    height="14"
+    layout="topleft"
+    left="-130"
+    length="1"
+    halign="right"
+    name="360_label"
+    text_color="0.3 0.82 1 1"
+    top_delta="0"
+    type="string"
+    width="115">
+    Take a 360 snapshot
+   </text>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index bc19d6e79f..bdc04a8a78 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -4,7 +4,7 @@
   can_dock="false"
   can_minimize="false"
   can_resize="false"
-  height="375"
+  height="430"
   help_topic="toybox"
   layout="topleft"
   legacy_header_height="18"
@@ -45,7 +45,7 @@
       Buttons will appear as shown or as icon-only depending on each toolbar's settings.
   </text>
   <toolbar
-    bottom="310"
+    bottom="365"
     button_display_mode="icons_with_text"
     follows="all"
     left="20"
@@ -81,11 +81,11 @@
   <panel
     bevel_style="none"
     border="true"
-    bottom="311"
+    bottom="366"
     follows="left|bottom|right"
     left="20"
     right="-20"
-    top="311" />
+    top="366" />
   <button
     follows="left|bottom|right"
     height="23"
@@ -94,7 +94,7 @@
     layout="topleft"
     left="185"
     name="btn_clear_all"
-    top="330"
+    top="385"
     width="130">
     <button.commit_callback function="Toybox.ClearAll" />
   </button>
@@ -106,7 +106,7 @@
     layout="topleft"
     left="335"
     name="btn_restore_defaults"
-    top="330"
+    top="385"
     width="130">
     <button.commit_callback function="Toybox.RestoreDefaults" />
   </button>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 72cce2208f..52afe9164e 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -733,6 +733,15 @@
              function="Floater.Show"
              parameter="snapshot" />
         </menu_item_call>
+        
+<menu_item_call
+         label="Capture 360"
+         name="Capture 360"
+         shortcut="control|alt|shift|s">
+            <menu_item_call.on_click
+             function="Floater.Show"
+             parameter="360capture" />
+        </menu_item_call>
         <menu_item_separator/>
         <menu_item_call
          label="Place profile"
@@ -3427,6 +3436,14 @@ function="World.EnvPreset"
                 <menu_item_call.on_click
                  function="Advanced.DumpRegionObjectCache" />
             </menu_item_call>
+        
+<menu_item_call
+             label="Interest List: Full Update"
+             name="Interest List: Full Update"
+             shortcut="alt|shift|I">
+                <menu_item_call.on_click
+                 function="Advanced.InterestListFullUpdate" />
+            </menu_item_call>
         </menu>
         <menu
          create_jump_keys="true"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d115e09d5b..ae04a7c2b4 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4124,6 +4124,8 @@ Try enclosing path to the editor with double quotes.
 
   <!-- commands -->
 
+  <string 
+name="Command_360_Capture_Label">360 Capture</string>
   <string name="Command_AboutLand_Label">About land</string>
   <string name="Command_Appearance_Label">Outfits</string>
   <string name="Command_Avatar_Label">Complete avatars</string>
@@ -4154,6 +4156,8 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_View_Label">Camera controls</string>
   <string name="Command_Voice_Label">Voice settings</string>
 
+  <string 
+name="Command_360_Capture_Tooltip">Capture a 360 panorama image</string>
   <string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string>
   <string name="Command_Appearance_Tooltip">Change your avatar</string>
   <string name="Command_Avatar_Tooltip">Choose a complete avatar</string>
-- 
cgit v1.2.3


From f78cb1c4ff7608a05976d6be7b568fbbbf36202b Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Fri, 20 Aug 2021 11:19:31 -0700
Subject: DRTVWR-534: collection of minor UI tweaks and fixes via XUI changes

---
 .../skins/default/xui/en/floater_360capture.xml    | 53 +++++++++++++---------
 indra/newview/skins/default/xui/en/menu_viewer.xml |  2 +-
 indra/newview/skins/default/xui/en/strings.xml     |  4 +-
 3 files changed, 35 insertions(+), 24 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_360capture.xml b/indra/newview/skins/default/xui/en/floater_360capture.xml
index c2959b9853..f24639d81a 100644
--- a/indra/newview/skins/default/xui/en/floater_360capture.xml
+++ b/indra/newview/skins/default/xui/en/floater_360capture.xml
@@ -7,7 +7,7 @@
          name="360capture"
          help_topic="360capture"
          save_rect="true"
-         title="360 Capture"
+         title="360 CAPTURE"
          width="800">
   <panel layout="topleft"
        background_visible="true"
@@ -18,7 +18,7 @@
        bg_opaque_color="0.195 0.195 0.195 1"
        background_opaque="true"
        height="400"
-       name="ui_panel">
+       name="ui_panel_left">
     <text
        follows="top|left|right"
        height="16"
@@ -89,7 +89,7 @@
                width="100"/>
     <button follows="left|top"
             height="20"
-            label="Capture 360 image"
+            label="Create 360 image"
             layout="topleft"
             left="10"
             name="capture_button"
@@ -97,28 +97,39 @@
             width="180" />
     <button follows="left|top"
             height="20"
-            label="Save as.."
+            label="Save as..."
             layout="topleft"
             left="10"
             name="save_local_button"
             top_delta="35"
             width="180" />
   </panel>
-  <web_browser top="0"
-               follows="all"
-               bg_opaque_color="0.225 0.225 0.225 1"
-               left="200"
-               width="600"
-               height="380"
-               name="360capture_contents"
-               trusted_content="true" />
-  <text follows="bottom"
-        layout="topleft"
-        name="statusbar"
-        height="17"
-        left="210"
-        top="383"
-        width="600">
-       Click and drag on the image to pan
-  </text>
+  <panel layout="topleft"
+     background_visible="true"
+     top="0"
+     follows="all"
+     left="200"
+     width="600"
+     bg_opaque_color="0.195 0.195 0.195 1"
+     background_opaque="true"
+     height="400"
+     name="ui_panel_right">
+    <web_browser top="10"
+                 follows="all"
+                 bg_opaque_color="0.225 0.225 0.225 1"
+                 left="0"
+                 width="590"
+                 height="368"
+                 name="360capture_contents"
+                 trusted_content="true" />
+    <text follows="bottom"
+          layout="topleft"
+          name="statusbar"
+          height="17"
+          left="0"
+          top="382"
+          width="590">
+      Click and drag on the image to pan
+    </text>
+  </panel>
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 52afe9164e..24d06722b9 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -735,7 +735,7 @@
         </menu_item_call>
         
 <menu_item_call
-         label="Capture 360"
+         label="360 snapshot"
          name="Capture 360"
          shortcut="control|alt|shift|s">
             <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ae04a7c2b4..db813a56b1 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4125,7 +4125,7 @@ Try enclosing path to the editor with double quotes.
   <!-- commands -->
 
   <string 
-name="Command_360_Capture_Label">360 Capture</string>
+name="Command_360_Capture_Label">360 snapshot</string>
   <string name="Command_AboutLand_Label">About land</string>
   <string name="Command_Appearance_Label">Outfits</string>
   <string name="Command_Avatar_Label">Complete avatars</string>
@@ -4157,7 +4157,7 @@ name="Command_360_Capture_Label">360 Capture</string>
   <string name="Command_Voice_Label">Voice settings</string>
 
   <string 
-name="Command_360_Capture_Tooltip">Capture a 360 panorama image</string>
+name="Command_360_Capture_Tooltip">Capture a 360 equirectangular image</string>
   <string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string>
   <string name="Command_Appearance_Tooltip">Change your avatar</string>
   <string name="Command_Avatar_Tooltip">Choose a complete avatar</string>
-- 
cgit v1.2.3


From e3eb9f0962d4dbf3072464c62fcaa693e15bcfb3 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Fri, 20 Aug 2021 15:00:32 -0700
Subject: DRTVWR-534: Miniscule but important change to make the name of the
 floater orthogonal throughout

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

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_360capture.xml b/indra/newview/skins/default/xui/en/floater_360capture.xml
index f24639d81a..c89489d145 100644
--- a/indra/newview/skins/default/xui/en/floater_360capture.xml
+++ b/indra/newview/skins/default/xui/en/floater_360capture.xml
@@ -7,7 +7,7 @@
          name="360capture"
          help_topic="360capture"
          save_rect="true"
-         title="360 CAPTURE"
+         title="360 SNAPSHOT"
          width="800">
   <panel layout="topleft"
        background_visible="true"
-- 
cgit v1.2.3


From 9150b16bbad64d4237b3234dbc1960ce4a45a519 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Fri, 20 Aug 2021 17:31:53 -0700
Subject: DRTVWR-534: another tiny change to stop the irritating text selection
 on drag in EQR preview window

---
 indra/newview/skins/default/html/common/equirectangular/eqr_gen.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/html/common/equirectangular/eqr_gen.html b/indra/newview/skins/default/html/common/equirectangular/eqr_gen.html
index 855c26c651..2675d37727 100644
--- a/indra/newview/skins/default/html/common/equirectangular/eqr_gen.html
+++ b/indra/newview/skins/default/html/common/equirectangular/eqr_gen.html
@@ -28,6 +28,7 @@
             transform: translate(-50%, -50%)
         }
         #quality_window {
+            user-select: none;
             z-index: 100;
             position:  absolute;
             left: 8px;
-- 
cgit v1.2.3


From ef0b48ce5a918d30e4303c7b6eebec69c21ab8cf Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 1 Oct 2021 14:09:12 +0300
Subject: SL-16119 Viewer should now direct IM 2 Email setting to web

---
 .../skins/default/xui/en/floater_preferences.xml   |  6 ------
 .../default/xui/en/panel_preferences_chat.xml      | 24 +++++++++++++---------
 2 files changed, 14 insertions(+), 16 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index ee730dcb01..c4adf0409d 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -11,12 +11,6 @@
  single_instance="true"
  title="PREFERENCES"
  width="658">
-    <floater.string
-     name="email_unverified_tooltip">
-        Please verify your email to enable IM to Email by visiting
-https://accounts.secondlife.com/change_email/
-    </floater.string>
- 
    <button
      follows="right|bottom"
      height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index c023cb036e..fee745aca3 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -41,16 +41,6 @@
         width="330">
     </check_box>
 
-    <check_box
-        enabled="false"
-        height="16"
-        label="Email me IMs when I'm offline"
-        layout="topleft"
-        name="send_im_to_email"
-        top_pad="6"
-        width="330">
-    </check_box>
-
     <check_box
         enabled="false"
         height="16"
@@ -61,6 +51,20 @@
         width="350">     
     </check_box>
 
+    <text
+       font="SansSerifSmall"
+       height="16"
+       layout="topleft"
+       length="1"       
+       name="email_settings"
+       skip_link_underline="true"
+       top_pad="6"
+       left_delta="2"
+       type="string"
+       width="350">
+      [https://accounts.secondlife.com/change_email Open email notification settings]
+    </text>
+
     <text
         layout="topleft"
         left="345"
-- 
cgit v1.2.3


From 630c4427447471a5a9e30b097789948cd236196b Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 2 Nov 2021 21:56:21 +0200
Subject: SL-16119 update link text

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

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index fee745aca3..35bd736d77 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -62,7 +62,7 @@
        left_delta="2"
        type="string"
        width="350">
-      [https://accounts.secondlife.com/change_email Open email notification settings]
+      [https://accounts.secondlife.com/change_email Email me IMs when I'm offline]
     </text>
 
     <text
-- 
cgit v1.2.3