From 0e7403df70d3298ba39f2269b999dbda574ea117 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 8 Apr 2021 21:37:12 +0300
Subject: SL-14076 Preview should show more data about motions
---
.../default/xui/en/floater_preview_animation.xml | 120 +++++++++++++++------
1 file changed, 90 insertions(+), 30 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
index 3ea5f54f2c..d1f8da55be 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
@@ -1,66 +1,126 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
- height="85"
+ height="241"
layout="topleft"
name="preview_anim"
help_topic="preview_anim"
- width="280">
+ width="320">
<floater.string
name="Title">
Animation: [NAME]
</floater.string>
- <text
- type="string"
- length="1"
- follows="left|top"
- font="SansSerif"
- height="19"
- layout="topleft"
- left="10"
- name="desc txt"
- top="25"
- width="80">
- Description:
- </text>
- <line_editor
- border_style="line"
- border_thickness="1"
- follows="left|top|right"
- font="SansSerifSmall"
- height="19"
- layout="topleft"
- left_delta="95"
- max_length_bytes="127"
- name="desc"
- top="19"
- width="170" />
<button
height="20"
label="Play Inworld"
label_selected="Stop"
+ follows="left|top"
layout="topleft"
left="10"
name="Inworld"
tool_tip="Play this animation so that others can see it"
- top="47"
+ top="25"
width="125">
<button.commit_callback
function="PreviewAnim.Play"
parameter="Inworld" />
</button>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ font="SansSerif"
+ height="19"
+ layout="topleft"
+ left_pad="10"
+ name="desc inworld"
+ top_delta="3"
+ width="160">
+ Other people can see
+ </text>
<button
height="20"
label="Play Locally"
label_selected="Stop"
+ follows="left|top"
layout="topleft"
- left_pad="5"
+ left="10"
name="Locally"
tool_tip="Play this animation so that only you can see it"
- top_delta="0"
+ top_pad="5"
width="125">
<button.commit_callback
function="PreviewAnim.Play"
parameter="Locally" />
</button>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ font="SansSerif"
+ height="19"
+ layout="topleft"
+ left_pad="10"
+ name="desc local"
+ top_delta="3"
+ width="160">
+ Only you can see
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ font="SansSerif"
+ height="19"
+ layout="topleft"
+ left="10"
+ name="desc txt"
+ top_pad="7"
+ width="80">
+ Description:
+ </text>
+ <line_editor
+ border_style="line"
+ border_thickness="1"
+ follows="left|top|right"
+ font="SansSerifSmall"
+ height="19"
+ layout="topleft"
+ left="10"
+ right="-10"
+ max_length_bytes="127"
+ name="desc"
+ top_pad="0" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ font="SansSerif"
+ height="19"
+ layout="topleft"
+ left="10"
+ name="adv_trigger"
+ top_pad="7"
+ width="100"
+ text_color="EmphasisColor">
+ Advanced
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ font="SansSerif"
+ height="91"
+ layout="topleft"
+ left="10"
+ name="AdvancedStats"
+ top_pad="3"
+ width="200">
+Priority: [PRIORITY]
+Duration: [DURATION]s
+Ease In: [EASE_IN]s
+Ease Out: [EASE_OUT]s
+Loop: [IS_LOOP]
+Joints: [NUM_JOINTS]
+ </text>
</floater>
--
cgit v1.2.3
From 105416600e27a3d8a850617520ce86ca215222a1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 12 Apr 2021 18:05:51 +0300
Subject: SL-15107 Fix some typos in llsetkeybinddialog
---
indra/newview/skins/default/xui/en/floater_select_key.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
index 48d9eee4cd..998948fca1 100644
--- a/indra/newview/skins/default/xui/en/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/en/floater_select_key.xml
@@ -33,7 +33,7 @@ Combination [KEYSTR] is reserved by menu.
height="30"
layout="topleft"
left="30"
- name="descritption"
+ name="description"
top="25"
word_wrap="true"
width="212">
--
cgit v1.2.3
From 45f3b6ed175397fbfbc2a31e927b2b4b25d3bc8c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 14 Apr 2021 17:59:44 +0300
Subject: SL-15107 Fix a typo in floater_model_preview
---
indra/newview/skins/default/xui/en/floater_model_preview.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 02a21764ce..bb61549592 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1624,7 +1624,7 @@ Analysed:
wrap="true"
width="462"
visible="true">
- You dont have rights to upload mesh models. [[VURL] Find out how] to get certified.
+ You don't have rights to upload mesh models. [[VURL] Find out how] to get certified.
</text>
<text
text_color="Yellow"
--
cgit v1.2.3
From 498b72aacd6d10dfcd4f15e1d16532dc138f0461 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 16 Apr 2021 22:52:11 +0300
Subject: SL-15129 Restore translated argument
---
indra/newview/skins/default/xui/es/floater_buy_contents.xml | 2 +-
indra/newview/skins/default/xui/es/floater_import_collada.xml | 10 +++++-----
indra/newview/skins/default/xui/es/notifications.xml | 8 ++++----
indra/newview/skins/default/xui/es/strings.xml | 10 +++++-----
4 files changed, 15 insertions(+), 15 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/es/floater_buy_contents.xml b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
index 3563d4bd0f..d078868db2 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_buy_contents" title="COMPRAR LOS CONTENIDOS">
<text name="contains_text">
- <nolink>[NOMBRE]</nolink> contiene:
+ <nolink>[NAME]</nolink> contiene:
</text>
<text name="buy_text">
¿Comprar por [AMOUNT] L$ a [NAME]?
diff --git a/indra/newview/skins/default/xui/es/floater_import_collada.xml b/indra/newview/skins/default/xui/es/floater_import_collada.xml
index 7e9a00797a..24df8e41a3 100644
--- a/indra/newview/skins/default/xui/es/floater_import_collada.xml
+++ b/indra/newview/skins/default/xui/es/floater_import_collada.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Import Collada" title="Importar escena">
<text name="mesh count">
- Redes: [RECUENTO]
+ Redes: [COUNT]
</text>
<text name="texture count">
- Texturas: [RECUENTO]
+ Texturas: [COUNT]
</text>
<text name="status">
- Estado: [ESTADO]
+ Estado: [STATUS]
</text>
<button label="Cancelar" name="cancel"/>
<button label="OK" name="ok"/>
@@ -15,9 +15,9 @@
Inactivo
</string>
<string name="status_uploading">
- Cargando [NOMBRE]
+ Cargando [NAME]
</string>
<string name="status_creating">
- Creando objeto [NOMBRE]
+ Creando objeto [NAME]
</string>
</floater>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index c7750320d5..54707116d4 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -3389,15 +3389,15 @@ Con los siguientes Residentes:
Error de transferencia a grupo.
</notification>
<notification name="ReleaseLandThrottled">
- La parcela [NOMBRE_PARCELA] no se puede abandonar en este momento.
+ La parcela [PARCEL_NAME] no se puede abandonar en este momento.
</notification>
<notification name="ReleasedLandWithReclaim">
- Ya está disponible la parcela [NOMBRE_PARCELA] de [ÁREA] m².
+ Ya está disponible la parcela [PARCEL_NAME] de [AREA] m².
-Dispondrás de [PERÍODO_DE_RECLAMACIÓN] horas para reclamar la cantidad de 0 L$ antes de que se ponga en venta.
+Dispondrás de [RECLAIM_PERIOD] horas para reclamar la cantidad de 0 L$ antes de que se ponga en venta.
</notification>
<notification name="ReleasedLandNoReclaim">
- Ya está disponible la parcela [NOMBRE_PARCELA] de [ÁREA] m².
+ Ya está disponible la parcela [PARCEL_NAME] de [AREA] m².
Ya está en venta.
</notification>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index f5e7d0bf4e..7017a7a5ab 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -208,10 +208,10 @@ Si deseas obtener más información, consulta las preguntas frecuentes que apare
http://secondlife.com/viewer-access-faq
</string>
<string name="LoginIntermediateOptionalUpdateAvailable">
- Actualización opcional del visor disponible: [VERSIÓN]
+ Actualización opcional del visor disponible: [VERSION]
</string>
<string name="LoginFailedRequiredUpdate">
- Actualización necesaria del visor: [VERSIÓN]
+ Actualización necesaria del visor: [VERSION]
</string>
<string name="LoginFailedAlreadyLoggedIn">
El agente ya ha iniciado sesión.
@@ -252,7 +252,7 @@ support@secondlife.com.
</string>
<string name="LoginFailedAcountSuspended">
No se podrá acceder a tu cuenta hasta las
-[HORA] (horario de la costa del Pacífico).
+[TIME] (horario de la costa del Pacífico).
</string>
<string name="LoginFailedAccountDisabled">
En este momento no podemos completar la solicitud.
@@ -265,7 +265,7 @@ Ponte en contacto con support@secondlife.com.
<string name="LoginFailedAccountMaintenance">
Se están realizando tareas rutinarias de mantenimiento en tu cuenta.
No se podrá acceder a tu cuenta hasta las
-[HORA] (horario de la costa del Pacífico).
+[TIME] (horario de la costa del Pacífico).
Si crees que se trata de un error, ponte en contacto con support@secondlife.com.
</string>
<string name="LoginFailedPendingLogoutFault">
@@ -283,7 +283,7 @@ Por favor, aguarda un momento antes de intentar conectarte nuevamente.
</string>
<string name="LoginFailedRestrictedHours">
Tu cuenta solo puede acceder a Second Life
-entre las [INICIO] y las [FIN] (horario de la costa del Pacífico).
+entre las [START] y las [END] (horario de la costa del Pacífico).
Inténtalo de nuevo durante ese horario.
Si crees que se trata de un error, ponte en contacto con support@secondlife.com.
</string>
--
cgit v1.2.3
From 39503419163aff0cb1cd305de924f4edc68833b0 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 29 Apr 2021 17:37:26 +0300
Subject: SL-15177 Added LLTextureFetchTester to log texture fetching state
timers
---
.../default/xui/en/floater_scene_load_stats.xml | 136 ++++++++-------------
1 file changed, 54 insertions(+), 82 deletions(-)
(limited to 'indra/newview/skins')
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..eb68b0e390 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
@@ -36,16 +36,14 @@
stat="FramePixelDifference"
bar_max="100"
tick_spacing="10"
- unit_scale="100"
- precision="0"/>
+ unit_scale="100"/>
<stat_bar name="bandwidth"
label="UDP Data Received"
orientation="horizontal"
unit_label="kbps"
stat="activemessagedatareceived"
bar_max="5000"
- tick_spacing="500"
- precision="0"/>
+ tick_spacing="500"/>
<stat_bar name="packet_loss"
label="Packet Loss"
orientation="horizontal"
@@ -53,9 +51,7 @@
stat="packetslostpercentstat"
bar_max="5"
tick_spacing="0.5"
- precision="3"
- show_bar="false"
- show_mean="true"/>
+ show_bar="false"/>
</stat_view>
<!--Advanced Section-->
<stat_view name="advanced"
@@ -73,7 +69,6 @@
stat="numobjectsstat"
bar_max="50000"
tick_spacing="5000"
- precision="0"
show_bar="false"/>
<stat_bar name="newobjs"
label="New Objects"
@@ -109,12 +104,39 @@
<stat_bar name="texture_cache_read_latency"
label="Cache Read Latency"
orientation="horizontal"
- unit_label="msec"
+ unit_label="sec"
stat="texture_cache_read_latency"
bar_max="1000.f"
tick_spacing="100"
show_history="true"
show_bar="false"/>
+ <stat_bar name="texture_decode_latency"
+ label="Cache Decode Latency"
+ orientation="horizontal"
+ unit_label="sec"
+ stat="texture_decode_latency"
+ bar_max="1000.f"
+ tick_spacing="100"
+ show_history="true"
+ show_bar="false"/>
+ <stat_bar name="texture_decode_latency"
+ label="Cache Write Latency"
+ orientation="horizontal"
+ unit_label="sec"
+ stat="texture_write_latency"
+ bar_max="1000.f"
+ tick_spacing="100"
+ show_history="true"
+ show_bar="false"/>
+ <stat_bar name="texture_fetch_latency"
+ label="Cache Fetch Latency"
+ orientation="horizontal"
+ unit_label="sec"
+ stat="texture_fetch_latency"
+ bar_max="1000.f"
+ tick_spacing="100"
+ show_history="true"
+ show_bar="false"/>
<stat_bar name="numimagesstat"
label="Count"
orientation="horizontal"
@@ -142,7 +164,6 @@
unit_label="/sec"
bar_max="1024.f"
tick_spacing="128.f"
- precision="1"
show_bar="false"/>
<stat_bar name="packetsoutstat"
label="Packets Out"
@@ -151,7 +172,6 @@
unit_label="/sec"
bar_max="1024.f"
tick_spacing="128.f"
- precision="1"
show_bar="false"/>
<stat_bar name="objectdatareceived"
label="Objects"
@@ -160,7 +180,6 @@
unit_label="kbps"
bar_max="1024.f"
tick_spacing="128.f"
- precision="1"
show_bar="false"/>
<stat_bar name="texturedatareceived"
label="Texture"
@@ -169,7 +188,6 @@
unit_label="kbps"
bar_max="1024.f"
tick_spacing="128.f"
- precision="1"
show_bar="false"/>
<stat_bar name="assetudpdatareceived"
label="Asset"
@@ -178,7 +196,6 @@
unit_label="kbps"
bar_max="1024.f"
tick_spacing="128.f"
- precision="1"
show_bar="false"/>
<stat_bar name="layersdatareceived"
label="Layers"
@@ -187,7 +204,6 @@
unit_label="kbps"
bar_max="1024.f"
tick_spacing="128.f"
- precision="1"
show_bar="false"/>
<stat_bar name="messagedatain"
label="Actual In"
@@ -196,7 +212,6 @@
unit_label="kbps"
bar_max="1024.f"
tick_spacing="128.f"
- precision="1"
show_bar="false"/>
<stat_bar name="messagedataout"
label="Actual Out"
@@ -205,7 +220,6 @@
unit_label="kbps"
bar_max="1024.f"
tick_spacing="128.f"
- precision="1"
show_bar="false"/>
<stat_bar name="vfspendingoperations"
label="VFS Pending Operations"
@@ -224,77 +238,61 @@
label="Objects"
orientation="horizontal"
stat="simobjects"
- precision="0"
bar_max="30000.f"
tick_spacing="5000.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<stat_bar name="simactiveobjects"
label="Active Objects"
orientation="horizontal"
stat="simactiveobjects"
- precision="0"
bar_max="5000.f"
tick_spacing="750.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<stat_bar name="simactivescripts"
label="Active Scripts"
orientation="horizontal"
stat="simactivescripts"
- precision="0"
bar_max="15000.f"
tick_spacing="1875.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<stat_bar name="siminpps"
label="Packets In"
orientation="horizontal"
stat="siminpps"
unit_label="pps"
- precision="0"
bar_max="2000.f"
tick_spacing="250.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<stat_bar name="simoutpps"
label="Packets Out"
orientation="horizontal"
stat="simoutpps"
unit_label="pps"
- precision="0"
bar_max="2000.f"
tick_spacing="250.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<stat_bar name="simpendingdownloads"
label="Pending Downloads"
orientation="horizontal"
stat="simpendingdownloads"
- precision="0"
bar_max="800.f"
tick_spacing="100.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<stat_bar name="simpendinguploads"
label="Pending Uploads"
orientation="horizontal"
stat="simpendinguploads"
- precision="0"
bar_max="100.f"
tick_spacing="25.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<stat_bar name="simtotalunackedbytes"
label="Total Unacked Bytes"
orientation="horizontal"
stat="simtotalunackedbytes"
unit_label="kb"
- precision="1"
bar_max="100000.f"
tick_spacing="25000.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<stat_view name="simperf"
label="Time (ms)"
show_label="true">
@@ -303,81 +301,65 @@
orientation="horizontal"
stat="simframemsec"
unit_label="ms"
- precision="3"
bar_max="40.f"
tick_spacing="10.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<stat_bar name="simnetmsec"
label="Net Time"
orientation="horizontal"
stat="simnetmsec"
unit_label="ms"
- precision="3"
bar_max="40.f"
tick_spacing="10.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<stat_bar name="simsimphysicsmsec"
label="Physics Time"
orientation="horizontal"
stat="simsimphysicsmsec"
unit_label="ms"
- precision="3"
bar_max="40.f"
tick_spacing="10.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<stat_bar name="simsimothermsec"
label="Simulation Time"
orientation="horizontal"
stat="simsimothermsec"
unit_label="ms"
- precision="3"
bar_max="40.f"
tick_spacing="10.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<stat_bar name="simagentmsec"
label="Agent Time"
orientation="horizontal"
stat="simagentmsec"
unit_label="ms"
- precision="3"
- bar_max="40.f"
+ bar_max="40.f"
tick_spacing="10.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<stat_bar name="simimagesmsec"
label="Images Time"
orientation="horizontal"
stat="simimagesmsec"
unit_label="ms"
- precision="3"
bar_max="40.f"
tick_spacing="10.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<stat_bar name="simscriptmsec"
label="Script Time"
orientation="horizontal"
stat="simscriptmsec"
unit_label="ms"
- precision="3"
bar_max="40.f"
tick_spacing="10.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<stat_bar name="simsparemsec"
label="Spare Time"
orientation="horizontal"
stat="simsparemsec"
unit_label="ms"
- precision="3"
bar_max="40.f"
tick_spacing="10.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<!--2nd level time blocks under 'Details' second-->
<stat_view name="timedetails"
label="Time Details (ms)"
@@ -387,51 +369,41 @@
orientation="horizontal"
stat="simsimphysicsstepmsec"
unit_label="ms"
- precision="3"
bar_max="40.f"
tick_spacing="10.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<stat_bar name="simsimphysicsshapeupdatemsec"
label=" Update Phys Shapes"
orientation="horizontal"
stat="simsimphysicsshapeupdatemsec"
unit_label="ms"
- precision="3"
- bar_max="40.f"
+ bar_max="40.f"
tick_spacing="10.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<stat_bar name="simsimphysicsothermsec"
label=" Physics Other"
orientation="horizontal"
stat="simsimphysicsothermsec"
unit_label="ms"
- precision="3"
bar_max="40.f"
tick_spacing="10.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<stat_bar name="simsleepmsec"
label=" Sleep Time"
orientation="horizontal"
stat="simsleepmsec"
unit_label="ms"
- precision="3"
bar_max="40.f"
tick_spacing="10.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
<stat_bar name="simpumpiomsec"
label=" Pump IO"
orientation="horizontal"
stat="simpumpiomsec"
unit_label="ms"
- precision="3"
bar_max="40.f"
tick_spacing="10.f"
- show_bar="false"
- show_mean="false"/>
+ show_bar="false"/>
</stat_view>
</stat_view>
</stat_view>
--
cgit v1.2.3
From c8977fd904df10f225915ac5527d279440356257 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 29 Apr 2021 17:38:15 +0300
Subject: SL-15177 Fix the way of counting for gTextureTimer
---
.../skins/default/xui/en/floater_scene_load_stats.xml | 9 +++++++++
.../skins/default/xui/en/floater_texture_fetch_debugger.xml | 12 ++++++++++++
2 files changed, 21 insertions(+)
(limited to 'indra/newview/skins')
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 eb68b0e390..3f493192ff 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
@@ -137,6 +137,15 @@
tick_spacing="100"
show_history="true"
show_bar="false"/>
+ <stat_bar name="texture_fetch_time"
+ label="Cache Fetch Time"
+ orientation="horizontal"
+ unit_label="sec"
+ stat="texture_fetch_time"
+ bar_max="1000.f"
+ tick_spacing="100"
+ show_history="true"
+ show_bar="false"/>
<stat_bar name="numimagesstat"
label="Count"
orientation="horizontal"
diff --git a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
index 1ea256b8b3..9278a1a598 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
@@ -317,6 +317,18 @@
<button.commit_callback
function="TexFetchDebugger.Close" />
</button>
+ <button
+ follows="left|top"
+ height="22"
+ label="Reset Fetching Time"
+ layout="topleft"
+ left_pad="175"
+ name="reset_time_btn"
+ top_delta="0"
+ width="120">
+ <button.commit_callback
+ function="TexFetchDebugger.ResetFetchTime" />
+ </button>
<button
follows="left|top"
height="20"
--
cgit v1.2.3
From 54a80085d75f2e286b29c708ae08d5f1e401ce0d Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 30 Apr 2021 20:24:34 +0300
Subject: SL-14769 Add dialog to warn user if inventory is unusable, force
logout
---
indra/newview/skins/default/xui/en/notifications.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a1c73d12d0..a486eb8cf2 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2937,6 +2937,17 @@ Darn. You have been logged out of [SECOND_LIFE].
yestext="View IM & Chat"/>
</notification>
+ <notification
+ icon="alertmodal.tga"
+ name="InventoryUnusable"
+ type="alertmodal">
+There is a problem with your inventory. First, try logging out and logging in again. If you see this message again, contact Support and ask them to correct the problem.
+ <tag>fail</tag>
+ <usetemplate
+ name="okbutton"
+ yestext="Log out"/>
+ </notification>
+
<notification
icon="alertmodal.tga"
name="OnlyOfficerCanBuyLand"
--
cgit v1.2.3
From 3392d5805e00cdbce1d269ee2da4f0c14b9a03c9 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 11 May 2021 18:16:24 +0300
Subject: SL-15199 Remember search results state after minimizing when pressing
CTRL+F
---
indra/newview/skins/default/xui/en/menu_viewer.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 0a50ff089f..ac69f5a748 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -487,8 +487,7 @@
function="Floater.Visible"
parameter="search" />
<menu_item_check.on_click
- function="Floater.Toggle"
- parameter="search" />
+ function="Avatar.ToggleSearch"/>
</menu_item_check>
<menu_item_separator/>
<menu_item_call
--
cgit v1.2.3
From f996c1c7744183c9ae96a697ad20a1d9fc03e9bb Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 31 May 2021 15:21:31 +0300
Subject: =?UTF-8?q?SL-15331=20Don't=20truncate=20server=20version=20in=20t?=
=?UTF-8?q?he=20=E2=80=9CRegion=20Estate=E2=80=9D=20floater?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
indra/newview/skins/default/xui/en/panel_region_general.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index 898e92e030..d1cfb8ead6 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -51,7 +51,7 @@
left_delta="50"
name="version_channel_text"
top_delta="0"
- width="225">
+ width="400">
unknown
</text>
<text
--
cgit v1.2.3
From 416ad1831f40052fccc01f012c4452d61e57f0f8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 3 Jun 2021 23:46:55 +0300
Subject: SL-15340 The list of parcels is duplicated after reopening
1. Clean list before requesting
2. Don't trigger onOpen from menu if already open
---
indra/newview/skins/default/xui/en/menu_viewer.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ac69f5a748..a5f79d4e28 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -542,7 +542,7 @@
label="My land holdings..."
name="My Land">
<menu_item_call.on_click
- function="Floater.Show"
+ function="Floater.ShowOrBringToFront"
parameter="land_holdings" />
</menu_item_call>
<menu_item_call
--
cgit v1.2.3
From 915eed04024f096f9644bf637387ab0455277202 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 10 Sep 2021 23:59:41 +0300
Subject: SL-15964 Simple test for compression library
---
indra/newview/skins/default/xui/en/menu_viewer.xml | 6 ++++++
indra/newview/skins/default/xui/en/notifications.xml | 10 ++++++++++
2 files changed, 16 insertions(+)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 72cce2208f..6ddaa99f78 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3883,6 +3883,12 @@ function="World.EnvPreset"
<menu_item_call.on_click
function="Advanced.CompressImage" />
</menu_item_call>
+ <menu_item_call
+ label="Compress File Test"
+ name="Compress File Test">
+ <menu_item_call.on_click
+ function="Advanced.CompressFileTest" />
+ </menu_item_call>
<menu_item_call
label="Enable Visual Leak Detector"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 70fe84736f..b769d20106 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11788,5 +11788,15 @@ Unable to load the track into [TRACK].
Unable to load the track from [TRACK1] into [TRACK2].
<tag>fail</tag>
</notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CompressionTestResults"
+ type="alertmodal">
+Test result for gzip level 6 file compression with [FILE] of size [SIZE] KB:
+Packing: [PACK_TIME]s [PSIZE]KB
+Unpacking: [UNPACK_TIME]s [USIZE]KB
+ <tag>fail</tag>
+ </notification>
</notifications>
--
cgit v1.2.3
From 9a3f836a8bbfa25dac484fb8ae8572039a24e401 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 13 Sep 2021 21:13:47 +0300
Subject: SL-15955 Group creation panel shows incorrect group disband warning
---
indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml
index c0265c2fa2..466fb91dd0 100644
--- a/indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml
@@ -307,7 +307,7 @@ background_visible="true"
top_pad="8"
word_wrap="true"
halign="center">
- Note: After 7 days, a group with no members (other than the creator) is deleted
+ Note: Any group that has less than two members for 48 hours is automatically disbanded
</text>
</layout_panel>
</layout_stack>
--
cgit v1.2.3
From 454c7f4543688126b2fa5c0560710f5a1733702e Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Tue, 5 Oct 2021 14:37:48 -0700
Subject: Fix: SL-12320 The Viewer functionality is broken with an in-viewer
enabled proxy
---
.../default/xui/en/panel_preferences_setup.xml | 32 ++++++++++++----------
1 file changed, 17 insertions(+), 15 deletions(-)
(limited to 'indra/newview/skins')
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 dff6f6e600..5e41ba4ae1 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -227,23 +227,25 @@
height="10"
layout="topleft"
left="30"
- name="Proxy Settings 1"
- mouse_opaque="false"
- top_pad="10"
- width="300">
- Proxy Settings:
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left="80"
- name="Proxy Settings 2"
+ name="Proxy Settings:"
mouse_opaque="false"
top_pad="5"
width="300">
- Your system's existing proxy settings will be used
+ Proxy Settings:
</text>
+ <button
+ label="Adjust proxy settings"
+ follows="left|top"
+ height="23"
+ width="140"
+ label_selected="Browse"
+ layout="topleft"
+ left_delta="50"
+ name="set_proxy"
+ top_pad="5"
+ >
+ <button.commit_callback
+ function="Pref.Proxy" />
+ </button>
</panel>
+
--
cgit v1.2.3
From 42fcfd03d5b4f376fd4254b3b675637656d3c668 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 3 Dec 2021 00:45:42 +0200
Subject: SL-16434 Fix menu localization
---
indra/newview/skins/default/xui/da/menu_place_add_button.xml | 4 ++--
indra/newview/skins/default/xui/da/menu_teleport_history_item.xml | 4 ++--
indra/newview/skins/default/xui/de/menu_place_add_button.xml | 4 ++--
indra/newview/skins/default/xui/de/menu_teleport_history_item.xml | 4 ++--
indra/newview/skins/default/xui/es/menu_place_add_button.xml | 4 ++--
indra/newview/skins/default/xui/es/menu_teleport_history_item.xml | 4 ++--
indra/newview/skins/default/xui/fr/menu_place_add_button.xml | 4 ++--
indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml | 4 ++--
indra/newview/skins/default/xui/it/menu_place_add_button.xml | 4 ++--
indra/newview/skins/default/xui/it/menu_teleport_history_item.xml | 4 ++--
indra/newview/skins/default/xui/ja/menu_place_add_button.xml | 4 ++--
indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml | 4 ++--
indra/newview/skins/default/xui/pl/menu_place_add_button.xml | 4 ++--
indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml | 4 ++--
indra/newview/skins/default/xui/pt/menu_place_add_button.xml | 4 ++--
indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml | 4 ++--
indra/newview/skins/default/xui/ru/menu_place_add_button.xml | 4 ++--
indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml | 4 ++--
indra/newview/skins/default/xui/tr/menu_place_add_button.xml | 4 ++--
indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml | 4 ++--
indra/newview/skins/default/xui/zh/menu_place_add_button.xml | 4 ++--
indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml | 4 ++--
22 files changed, 44 insertions(+), 44 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/da/menu_place_add_button.xml b/indra/newview/skins/default/xui/da/menu_place_add_button.xml
index 7ad2253550..c43ec6b1b7 100644
--- a/indra/newview/skins/default/xui/da/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/da/menu_place_add_button.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
<menu_item_call label="Opret mappe" name="add_folder"/>
<menu_item_call label="Tilføj landemærke" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml
index dbaec62087..825ab056d9 100644
--- a/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
<menu_item_call label="Teleportér" name="Teleport"/>
<menu_item_call label="Mere information" name="More Information"/>
<menu_item_call label="Kopiér til udklipsholder" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_place_add_button.xml b/indra/newview/skins/default/xui/de/menu_place_add_button.xml
index 7c0ff4a46a..975e5b4497 100644
--- a/indra/newview/skins/default/xui/de/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/de/menu_place_add_button.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
<menu_item_call label="Ordner hinzufügen" name="add_folder"/>
<menu_item_call label="Landmarke hinzufügen" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml
index 1d7e3059c0..8f3bf84151 100644
--- a/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
<menu_item_call label="Teleportieren" name="Teleport"/>
<menu_item_call label="Weitere Informationen" name="More Information"/>
<menu_item_call label="SLurl kopieren" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_place_add_button.xml b/indra/newview/skins/default/xui/es/menu_place_add_button.xml
index 4b2f908a06..2032b9add9 100644
--- a/indra/newview/skins/default/xui/es/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/es/menu_place_add_button.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
<menu_item_call label="Añadir una carpeta" name="add_folder"/>
<menu_item_call label="Añadir este hito" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml
index 1ff555b727..d54cd65478 100644
--- a/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
<menu_item_call label="Teleportar" name="Teleport"/>
<menu_item_call label="Más información" name="More Information"/>
<menu_item_call label="Copiar la SLurl" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_place_add_button.xml b/indra/newview/skins/default/xui/fr/menu_place_add_button.xml
index 92f9e7719d..4bae34beaa 100644
--- a/indra/newview/skins/default/xui/fr/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/fr/menu_place_add_button.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
<menu_item_call label="Ajouter un dossier" name="add_folder"/>
<menu_item_call label="Ajouter un repère" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml
index ba8ed9b3f8..ef864029ba 100644
--- a/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
<menu_item_call label="Téléporter" name="Teleport"/>
<menu_item_call label="Plus d'informations" name="More Information"/>
<menu_item_call label="Copier la SLurl" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_place_add_button.xml b/indra/newview/skins/default/xui/it/menu_place_add_button.xml
index 0e783c0000..abdc0ea794 100644
--- a/indra/newview/skins/default/xui/it/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/it/menu_place_add_button.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
<menu_item_call label="Aggiungi cartella" name="add_folder"/>
<menu_item_call label="Aggiungi punto di riferimento" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
index 31236895fa..f7da322006 100644
--- a/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
<menu_item_call label="Teleport" name="Teleport"/>
<menu_item_call label="Maggiori informazioni" name="More Information"/>
<menu_item_call label="Copia SLurl" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
index d5ce88b055..d19bc44451 100644
--- a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
<menu_item_call label="フォルダを追加" name="add_folder"/>
<menu_item_call label="ランドマークを追加" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
index 61642048b8..1cc230e5b6 100644
--- a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
<menu_item_call label="テレポート" name="Teleport"/>
<menu_item_call label="もっと詳しく" name="More Information"/>
<menu_item_call label="SLurl をコピー" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_place_add_button.xml b/indra/newview/skins/default/xui/pl/menu_place_add_button.xml
index ff19f32ba8..107d4fae3a 100644
--- a/indra/newview/skins/default/xui/pl/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/pl/menu_place_add_button.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
<menu_item_call label="Dodaj folder" name="add_folder" />
<menu_item_call label="Dodaj do Landmarków" name="add_landmark" />
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
index 7d8519324f..0ed1d510eb 100644
--- a/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
<menu_item_call label="Teleportuj" name="Teleport" />
<menu_item_call label="Więcej szczegółów" name="More Information" />
<menu_item_call label="Kopiuj SLurl do schowka" name="CopyToClipboard" />
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_place_add_button.xml b/indra/newview/skins/default/xui/pt/menu_place_add_button.xml
index d099d04f8d..89a634d12f 100644
--- a/indra/newview/skins/default/xui/pt/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/pt/menu_place_add_button.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
<menu_item_call label="Adicionar pasta" name="add_folder"/>
<menu_item_call label="Adicionar marco" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml
index 3a2b3a8847..db759cb4e3 100644
--- a/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
<menu_item_call label="Teletransportar" name="Teleport"/>
<menu_item_call label="Mais informações" name="More Information"/>
<menu_item_call label="Copiar SLurl" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_place_add_button.xml b/indra/newview/skins/default/xui/ru/menu_place_add_button.xml
index b1a38fb9eb..9298c032d5 100644
--- a/indra/newview/skins/default/xui/ru/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/ru/menu_place_add_button.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
<menu_item_call label="Добавить папку" name="add_folder"/>
<menu_item_call label="Добавить закладку" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
index f495d27bf3..84a76ae0e0 100644
--- a/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
<menu_item_call label="Телепорт" name="Teleport"/>
<menu_item_call label="Информация" name="More Information"/>
<menu_item_call label="Копировать URL SL" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_place_add_button.xml b/indra/newview/skins/default/xui/tr/menu_place_add_button.xml
index 8e52b3f7f2..69bc265823 100644
--- a/indra/newview/skins/default/xui/tr/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/tr/menu_place_add_button.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
<menu_item_call label="Klasör Ekle" name="add_folder"/>
<menu_item_call label="Yer İmi Ekle" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml
index d7ff807c3d..59ba134965 100644
--- a/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
<menu_item_call label="Işınla" name="Teleport"/>
<menu_item_call label="Ek Bilgi" name="More Information"/>
<menu_item_call label="SLurl'i Kopyala" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
index 95f8917234..165e2b6f08 100644
--- a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
<menu_item_call label="添加資料夾" name="add_folder"/>
<menu_item_call label="添加地標" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
index bf60983896..200e1904f6 100644
--- a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
<menu_item_call label="瞬間傳送" name="Teleport"/>
<menu_item_call label="更多資訊" name="More Information"/>
<menu_item_call label="覆製 SLurl" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>
--
cgit v1.2.3
From 150993e2c2efbf75f268aec2d22257e4b562f274 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 7 Dec 2021 17:56:02 +0200
Subject: SL-16450 Don not crash viewer in case of invalid data type
---
indra/newview/skins/default/xui/en/notifications.xml | 13 +++++++++++++
1 file changed, 13 insertions(+)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b769d20106..756bb52e3e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -212,6 +212,19 @@ Make sure your Internet connection is working properly.
yestext="OK"/>
</notification>
+ <notification
+ icon="alertmodal.tga"
+ name="LoginFailedToParse"
+ type="alertmodal">
+ <tag>fail</tag>
+Viewer received malformed response from server. Please, make sure your Internet connection is working properly and try again later.
+
+If you feel this is in error, please contact Support.
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
<notification
icon="alertmodal.tga"
name="MessageTemplateNotFound"
--
cgit v1.2.3
From 1f3d744fdfe2781bac1dc3829318809eef3c6309 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 29 Sep 2021 20:13:07 +0300
Subject: SL-16105 Crash at LLTrackBlenderLoopingManual's setPosition
User opened editor, pressed play, according to logs environment wasn't loaded yet, asset had yet to arrive.
---
indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml | 3 +++
1 file changed, 3 insertions(+)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index c609e3bd3a..31c524c38a 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -342,6 +342,7 @@
width="25">
<button
name="skip_back_btn"
+ enabled="false"
follows="top"
image_overlay="SkipBackward_Off"
image_disabled="PushButton_Disabled"
@@ -373,6 +374,7 @@
width="25">
<button
name="play_btn"
+ enabled="false"
follows="top"
image_overlay="Play_Off"
image_disabled="PushButton_Disabled"
@@ -434,6 +436,7 @@
width="25">
<button
name="skip_forward_btn"
+ enabled="false"
follows="top"
image_overlay="SkipForward_Off"
image_disabled="PushButton_Disabled"
--
cgit v1.2.3
From 38e77cb958cc88dd75e4d06994c0c93953692f83 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 11 Jan 2022 21:13:17 +0200
Subject: SL-16614 Viewer's uploader crash with RenderGLCoreProfile
---
indra/newview/skins/default/xui/en/notifications.xml | 7 +++++++
1 file changed, 7 insertions(+)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 756bb52e3e..4063626d8c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8789,6 +8789,13 @@ See SecondLife.log for details
type="alert">
Error while requesting mesh upload permissons.
</notification>
+
+ <notification
+ name="MeshUploadProfilerError"
+ icon="alert.tga"
+ type="alert">
+Mesh uploader is incompatible with RenderGLCoreProfile, please turn RenderGLCoreProfile off in debug settings and restart the viewer.
+ </notification>
<notification
name="RegionCapabilityRequestError"
--
cgit v1.2.3
From 350d2c5d7a14d0401e80321ac57b2449a8b523a5 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 2 Feb 2022 02:55:32 +0200
Subject: SL-14769 Allow to log-in, even if there's an inventory error
---
indra/newview/skins/default/xui/en/notifications.xml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 4063626d8c..2007abefd7 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2964,11 +2964,8 @@ Darn. You have been logged out of [SECOND_LIFE].
icon="alertmodal.tga"
name="InventoryUnusable"
type="alertmodal">
-There is a problem with your inventory. First, try logging out and logging in again. If you see this message again, contact Support and ask them to correct the problem.
+There was a problem loading your inventory. First, try logging out and logging in again. If you see this message again, contact Support to correct the problem.
<tag>fail</tag>
- <usetemplate
- name="okbutton"
- yestext="Log out"/>
</notification>
<notification
--
cgit v1.2.3