From 2aecd42d1ffc2ee056b60a66d5c39f09312e1fbe Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Tue, 1 Aug 2023 15:51:18 -0700
Subject: First commit of code to investigate how we might do bulk uploads of
inventory item thumbnails - both from a code and a UI perspective
---
.../skins/default/xui/en/floater_bulky_thumbs.xml | 42 ++++++++++++++++++++++
indra/newview/skins/default/xui/en/menu_viewer.xml | 8 +++++
2 files changed, 50 insertions(+)
create mode 100644 indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
new file mode 100644
index 0000000000..867c8fdc20
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="600"
+ layout="topleft"
+ min_height="175"
+ min_width="250"
+ name="contents"
+ help_topic="contents"
+ title="BULKY THUMBS"
+ width="500">
+ <button follows="left|top"
+ height="20"
+ label="Paste from Inventory copy"
+ layout="topleft"
+ left="10"
+ name="paste_from_inventory"
+ top="26 "
+ width="200" />
+
+ <text_editor
+ height="510"
+ follows="top|left|right|bottom"
+ left_delta="0"
+ name="inv_items"
+ top_pad="10"
+ width="480">
+Entry 1
+Entry 2
+Entry 3
+Entry 4
+ </text_editor>
+ <button follows="left|bottom"
+ height="20"
+ label="Process!"
+ layout="bottomleft"
+ left="10"
+ name="process_bulky_thumbs"
+ bottom="8"
+ width="200" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f72d1f0bf9..ebfe1405c9 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3485,6 +3485,14 @@ function="World.EnvPreset"
function="Advanced.WebContentTest"
parameter="http://duckduckgo.com"/>
</menu_item_call>
+ <menu_item_call
+ label="Bulky Thumbs"
+ name="Bulky Thumbs"
+ shortcut="control|alt|shift|Y">
+ <menu_item_call.on_click
+ function="Floater.Show"
+ parameter="bulky_thumbs" />
+ </menu_item_call>
<menu_item_call
label="FB Connect Test"
name="FB Connect Test">
--
cgit v1.2.3
From 4ce14631678195d7256e11a02f646396e3bc2dd8 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Tue, 1 Aug 2023 16:56:06 -0700
Subject: SL-20109: write the name of each copied inventory item to the text
editor
---
indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
index 867c8fdc20..ecb07db8fa 100644
--- a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
@@ -23,7 +23,7 @@
height="510"
follows="top|left|right|bottom"
left_delta="0"
- name="inv_items"
+ name="inventory_items"
top_pad="10"
width="480">
Entry 1
--
cgit v1.2.3
From 03ca9468036fc65e1a75d323bfb6d90b410a304b Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 2 Aug 2023 17:34:56 -0700
Subject: SL-20109: now lets user copy a list of items or list of folder of
items, copy a list of texture of list of folders of textures, then combine
them and find matches by name - saving each match with the name, item ID and
thumbnail texture ID - next is actually writing the thumbnails
---
.../skins/default/xui/en/floater_bulky_thumbs.xml | 32 ++++++++++++++++------
1 file changed, 23 insertions(+), 9 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
index ecb07db8fa..ab34e35dac 100644
--- a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
@@ -5,38 +5,52 @@
height="600"
layout="topleft"
min_height="175"
- min_width="250"
+ min_width="500"
name="contents"
help_topic="contents"
title="BULKY THUMBS"
width="500">
<button follows="left|top"
height="20"
- label="Paste from Inventory copy"
+ label="Paste item info from Inventory"
layout="topleft"
left="10"
- name="paste_from_inventory"
+ name="paste_items_btn"
top="26 "
width="200" />
+ <button follows="left|top"
+ height="20"
+ label="Paste texture info from Inventory"
+ layout="topleft"
+ left="250"
+ name="paste_textures_btn"
+ top="26 "
+ width="200" />
+
<text_editor
height="510"
follows="top|left|right|bottom"
- left_delta="0"
+ left="10"
name="inventory_items"
top_pad="10"
width="480">
-Entry 1
-Entry 2
-Entry 3
-Entry 4
</text_editor>
<button follows="left|bottom"
height="20"
- label="Process!"
+ label="Merge items and textures"
layout="bottomleft"
left="10"
name="process_bulky_thumbs"
bottom="8"
width="200" />
+
+ <button follows="left|bottom"
+ height="20"
+ label="Write Thumbnails"
+ layout="bottomleft"
+ left="250"
+ name="write_bulky_thumbs"
+ bottom="8"
+ width="200" />
</floater>
--
cgit v1.2.3
From 263e097ef7772ddbb69f575e20b31fd801dafc8e Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 3 Aug 2023 18:54:49 -0700
Subject: SL-20109: Big clean up. Now supports arbitrary mix of folders and
entries for both items and textures. Better logging output
---
.../skins/default/xui/en/floater_bulky_thumbs.xml | 109 +++++++++++----------
1 file changed, 55 insertions(+), 54 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
index ab34e35dac..e94717f947 100644
--- a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
@@ -1,56 +1,57 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
- legacy_header_height="18"
- can_resize="true"
- height="600"
- layout="topleft"
- min_height="175"
- min_width="500"
- name="contents"
- help_topic="contents"
- title="BULKY THUMBS"
- width="500">
- <button follows="left|top"
- height="20"
- label="Paste item info from Inventory"
- layout="topleft"
- left="10"
- name="paste_items_btn"
- top="26 "
- width="200" />
-
- <button follows="left|top"
- height="20"
- label="Paste texture info from Inventory"
- layout="topleft"
- left="250"
- name="paste_textures_btn"
- top="26 "
- width="200" />
-
- <text_editor
- height="510"
- follows="top|left|right|bottom"
- left="10"
- name="inventory_items"
- top_pad="10"
- width="480">
- </text_editor>
- <button follows="left|bottom"
- height="20"
- label="Merge items and textures"
- layout="bottomleft"
- left="10"
- name="process_bulky_thumbs"
- bottom="8"
- width="200" />
-
- <button follows="left|bottom"
- height="20"
- label="Write Thumbnails"
- layout="bottomleft"
- left="250"
- name="write_bulky_thumbs"
- bottom="8"
- width="200" />
-</floater>
+ legacy_header_height="18"
+ can_resize="true"
+ height="600"
+ layout="topleft"
+ min_height="175"
+ min_width="500"
+ name="contents"
+ help_topic="contents"
+ title="BULKY THUMBS"
+ width="500">
+ <button
+ follows="left|top"
+ height="20"
+ label="Paste items from Inventory"
+ layout="topleft"
+ left="10"
+ name="paste_items_btn"
+ top="26 "
+ width="200" />
+ <button
+ follows="left|top"
+ height="20"
+ label="Paste textures from Inventory"
+ layout="topleft"
+ left="250"
+ name="paste_textures_btn"
+ top="26 "
+ width="200" />
+ <text_editor
+ height="510"
+ follows="top|left|right|bottom"
+ left="10"
+ name="output_log"
+ top_pad="10"
+ width="480">
+ </text_editor>
+ <button
+ follows="left|bottom"
+ height="20"
+ label="Merge items and textures"
+ layout="bottomleft"
+ left="10"
+ name="merge_items_textures"
+ bottom="8"
+ width="200" />
+ <button
+ follows="left|bottom"
+ height="20"
+ label="Write Thumbnails"
+ layout="bottomleft"
+ left="250"
+ name="write_items_thumbnails"
+ bottom="8"
+ width="200" />
+</floater>
\ No newline at end of file
--
cgit v1.2.3
From 2d39f05cc1403da307be05edc972d2ebcec6cfc7 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Fri, 11 Aug 2023 18:07:13 -0700
Subject: SL-20109: Now that it seems that the tool might be useful, make a
new version with a proper name and start worknig on it. Prototype bulky
thumbs one will be removed after new version is working
---
.../xui/en/floater_inventory_thumbnails_helper.xml | 78 ++++++++++++++++++++++
indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++-
2 files changed, 87 insertions(+), 1 deletion(-)
create mode 100644 indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
new file mode 100644
index 0000000000..79e0ef2b9f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="false"
+ height="600"
+ layout="topleft"
+ min_height="175"
+ min_width="500"
+ name="contents"
+ help_topic="contents"
+ title="Inventory Thumbnails Helper"
+ width="500">
+ <scroll_list
+ top="20"
+ height="350"
+ draw_heading="true"
+ follows="all"
+ layout="topleft"
+ left="8"
+ multi_select="true"
+ name="inventory_thumbnails_textures_list"
+ right="-8"
+ tool_tip="Paste items from your inventory">
+ <scroll_list.columns
+ label="Inventory Item"
+ name="name"
+ relative_width="0.40" />
+ <scroll_list.columns
+ dynamic_width="true"
+ label="Texture Name"
+ name="expires"
+ relative_width="0.6" />
+ </scroll_list>
+ <text_editor
+ top="375"
+ height="140"
+ follows="all"
+ left="8"
+ right="-8"
+ name="output_log"
+ width="480"></text_editor>
+ <button
+ follows="left|bottom"
+ height="20"
+ label="Paste items from Inventory"
+ layout="topleft"
+ left="10"
+ name="paste_items_btn"
+ bottom="-60"
+ width="235" />
+ <button
+ follows="left|bottom"
+ height="20"
+ label="Paste textures from Inventory"
+ layout="topleft"
+ left_delta="0"
+ name="paste_textures_btn"
+ top_delta="26 "
+ width="235" />
+ <button
+ follows="left|bottom"
+ height="20"
+ label="Write Thumbnails"
+ layout="topleft"
+ left_delta="0"
+ name="write_items_thumbnails_btn"
+ top_delta="26 "
+ width="235" />
+ <button
+ follows="left|bottom"
+ height="20"
+ label="List items with no thumb"
+ layout="bottomleft"
+ right="-10"
+ name="list_items_no_thumb_btn"
+ bottom="60"
+ width="235" />
+</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 ebfe1405c9..1fe26cee2c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3493,7 +3493,15 @@ function="World.EnvPreset"
function="Floater.Show"
parameter="bulky_thumbs" />
</menu_item_call>
- <menu_item_call
+ <menu_item_call
+ label="Inventory Thumbnails Helper"
+ name="Inventory Thumbnails Helper"
+ shortcut="control|alt|shift|X">
+ <menu_item_call.on_click
+ function="Floater.Show"
+ parameter="inventory_thumbnails_helper" />
+ </menu_item_call>
+ <menu_item_call
label="FB Connect Test"
name="FB Connect Test">
<menu_item_call.on_click
--
cgit v1.2.3
From abb8d0402c8498dc5ce8dfec1438f2fedbaecce9 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Fri, 11 Aug 2023 18:31:21 -0700
Subject: SL-20109: Some small UI tweaks before moving onto the meat of the
functionality
---
.../skins/default/xui/en/floater_inventory_thumbnails_helper.xml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
index 79e0ef2b9f..62d0417f9e 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
@@ -38,7 +38,10 @@
left="8"
right="-8"
name="output_log"
- width="480"></text_editor>
+ font="Monospace"
+ text_color="0.1 0.5 0.1 1.0"
+ width="480">
+ </text_editor>
<button
follows="left|bottom"
height="20"
@@ -63,7 +66,7 @@
label="Write Thumbnails"
layout="topleft"
left_delta="0"
- name="write_items_thumbnails_btn"
+ name="write_thumbnails_btn"
top_delta="26 "
width="235" />
<button
--
cgit v1.2.3
From cf60c97f6f232f97666884ef692779403fb449f8 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Mon, 14 Aug 2023 17:37:10 -0700
Subject: SL-20109: New, helper version coming together slowly modulo XUI pain
---
.../skins/default/xui/en/floater_inventory_thumbnails_helper.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
index 62d0417f9e..512bce2475 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
@@ -13,12 +13,13 @@
<scroll_list
top="20"
height="350"
+ draw_stripes="true"
draw_heading="true"
follows="all"
layout="topleft"
left="8"
multi_select="true"
- name="inventory_thumbnails_textures_list"
+ name="inventory_thumbnails_list"
right="-8"
tool_tip="Paste items from your inventory">
<scroll_list.columns
@@ -28,7 +29,7 @@
<scroll_list.columns
dynamic_width="true"
label="Texture Name"
- name="expires"
+ name="texture"
relative_width="0.6" />
</scroll_list>
<text_editor
--
cgit v1.2.3
From 10276ee967a5ad860fbf8750ce1012db3c5ae78a Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 17 Aug 2023 15:49:50 -0700
Subject: Small updates to bulky thumbs but mainly, this is about the first
version of the Inventory Thumbnail Helper tool - see source file for a link
to Confluence page listing how to use it
---
.../skins/default/xui/en/floater_bulky_thumbs.xml | 15 ++++++++--
.../xui/en/floater_inventory_thumbnails_helper.xml | 33 ++++++++++++++++------
.../newview/skins/default/xui/en/notifications.xml | 14 +++++++++
3 files changed, 51 insertions(+), 11 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
index e94717f947..d23fd1247f 100644
--- a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
@@ -44,14 +44,23 @@
left="10"
name="merge_items_textures"
bottom="8"
- width="200" />
+ width="100" />
<button
follows="left|bottom"
height="20"
label="Write Thumbnails"
layout="bottomleft"
- left="250"
+ left="150"
name="write_items_thumbnails"
bottom="8"
- width="200" />
+ width="100" />
+ <button
+ follows="left|bottom"
+ height="20"
+ label="Missing Thumbnails"
+ layout="bottomleft"
+ left="250"
+ name="display_thumbless_items"
+ bottom="8"
+ width="100" />
</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
index 512bce2475..aa3500bac2 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
@@ -9,7 +9,7 @@
name="contents"
help_topic="contents"
title="Inventory Thumbnails Helper"
- width="500">
+ width="800">
<scroll_list
top="20"
height="350"
@@ -23,14 +23,20 @@
right="-8"
tool_tip="Paste items from your inventory">
<scroll_list.columns
+ dynamic_width="true"
label="Inventory Item"
- name="name"
- relative_width="0.40" />
+ name="item_name"
+ relative_width="0.4" />
+ <scroll_list.columns
+ dynamic_width="true"
+ label="Existing Texture"
+ name="existing_texture"
+ relative_width="0.3" />
<scroll_list.columns
dynamic_width="true"
- label="Texture Name"
- name="texture"
- relative_width="0.6" />
+ label="New Texture"
+ name="new_texture"
+ relative_width="0.3" />
</scroll_list>
<text_editor
top="375"
@@ -73,10 +79,21 @@
<button
follows="left|bottom"
height="20"
- label="List items with no thumb"
+ label="Log items with no thumbnail"
layout="bottomleft"
right="-10"
- name="list_items_no_thumb_btn"
+ name="log_missing_thumbnails_btn"
bottom="60"
width="235" />
+ <button
+ follows="left|bottom"
+ height="20"
+ label="Clear thumbnails from pasted items"
+ layout="bottomleft"
+ right="-10"
+ name="clear_thumbnails_btn"
+ top_delta="26"
+ width="235" />
+
+
</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ef720e65e3..45020163ef 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12074,4 +12074,18 @@ Would you like to save them first?
yestext="Yes"/>
</notification>
+ <notification
+ icon="alertmodal.tga"
+ name="ClearInventoryThumbnailsWarning"
+ type="alertmodal">
+ You are about to remove thumbnail images from the inventory items in the list. This change cannot be undone.
+
+ Would you like to proceed?
+ <tag>confirm</tag>
+ <usetemplate
+ name="okcancelbuttons"
+ notext="No"
+ yestext="Yes"/>
+ </notification>
+
</notifications>
--
cgit v1.2.3
From d3147517b4b0f0abc7e9f753eddb3a39343a2fa9 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 17 Aug 2023 15:55:42 -0700
Subject: Remove the original prototype tool Bulky Thumbs since it is now
superceded by the Inventory Thumbnail Helper tool
---
.../skins/default/xui/en/floater_bulky_thumbs.xml | 66 ----------------------
indra/newview/skins/default/xui/en/menu_viewer.xml | 8 ---
2 files changed, 74 deletions(-)
delete mode 100644 indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
deleted file mode 100644
index d23fd1247f..0000000000
--- a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_resize="true"
- height="600"
- layout="topleft"
- min_height="175"
- min_width="500"
- name="contents"
- help_topic="contents"
- title="BULKY THUMBS"
- width="500">
- <button
- follows="left|top"
- height="20"
- label="Paste items from Inventory"
- layout="topleft"
- left="10"
- name="paste_items_btn"
- top="26 "
- width="200" />
- <button
- follows="left|top"
- height="20"
- label="Paste textures from Inventory"
- layout="topleft"
- left="250"
- name="paste_textures_btn"
- top="26 "
- width="200" />
- <text_editor
- height="510"
- follows="top|left|right|bottom"
- left="10"
- name="output_log"
- top_pad="10"
- width="480">
- </text_editor>
- <button
- follows="left|bottom"
- height="20"
- label="Merge items and textures"
- layout="bottomleft"
- left="10"
- name="merge_items_textures"
- bottom="8"
- width="100" />
- <button
- follows="left|bottom"
- height="20"
- label="Write Thumbnails"
- layout="bottomleft"
- left="150"
- name="write_items_thumbnails"
- bottom="8"
- width="100" />
- <button
- follows="left|bottom"
- height="20"
- label="Missing Thumbnails"
- layout="bottomleft"
- left="250"
- name="display_thumbless_items"
- bottom="8"
- width="100" />
-</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 1fe26cee2c..ce5b2e3cd8 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3485,14 +3485,6 @@ function="World.EnvPreset"
function="Advanced.WebContentTest"
parameter="http://duckduckgo.com"/>
</menu_item_call>
- <menu_item_call
- label="Bulky Thumbs"
- name="Bulky Thumbs"
- shortcut="control|alt|shift|Y">
- <menu_item_call.on_click
- function="Floater.Show"
- parameter="bulky_thumbs" />
- </menu_item_call>
<menu_item_call
label="Inventory Thumbnails Helper"
name="Inventory Thumbnails Helper"
--
cgit v1.2.3
From d2bb4cd19d3a044276cc4c60770cff607d697b35 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Mon, 21 Aug 2023 10:58:52 -0700
Subject: SL-20172: Add in an 'Are you sure Y/N' type dialog before writing
thumbnails (as well as for clearing thumbnails) since it's also a
destructive, non-undoiable operation
---
indra/newview/skins/default/xui/en/notifications.xml | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
(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 45020163ef..ca9f2c07e8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12087,5 +12087,17 @@ Would you like to save them first?
notext="No"
yestext="Yes"/>
</notification>
-
+ <notification
+ icon="alertmodal.tga"
+ name="WriteInventoryThumbnailsWarning"
+ type="alertmodal">
+ You are about to overwrite thumbnail images for some or all of the inventory items in the list. This change cannot be undone.
+
+ Would you like to proceed?
+ <tag>confirm</tag>
+ <usetemplate
+ name="okcancelbuttons"
+ notext="No"
+ yestext="Yes"/>
+ </notification
</notifications>
--
cgit v1.2.3
From 82ee49ad9ff5ca95d9f7215a959612c4efa21599 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Mon, 21 Aug 2023 11:22:30 -0700
Subject: SL-20172: I missed a closing angle brace after adding a new XML
notification entry - mysteriously, the Viewer still worked as expected but
the TeamCity coding check policy (WTF??) got a bit sad about it..
---
indra/newview/skins/default/xui/en/notifications.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(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 ca9f2c07e8..f7a581e3d7 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12087,6 +12087,7 @@ Would you like to save them first?
notext="No"
yestext="Yes"/>
</notification>
+
<notification
icon="alertmodal.tga"
name="WriteInventoryThumbnailsWarning"
@@ -12099,5 +12100,5 @@ Would you like to save them first?
name="okcancelbuttons"
notext="No"
yestext="Yes"/>
- </notification
+ </notification>
</notifications>
--
cgit v1.2.3
From a1695760821b4d19af204918a1764d9fca3e99b9 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 24 Oct 2023 19:31:20 +0300
Subject: SL-20468 Add ability to overwrite an existing outfit
---
.../default/xui/en/menu_gallery_inventory.xml | 6 +-
.../default/xui/en/menu_gallery_outfit_tab.xml | 94 ++++++++------
.../skins/default/xui/en/menu_inventory.xml | 6 +-
.../skins/default/xui/en/menu_outfit_gear.xml | 138 ++++++++++++---------
.../skins/default/xui/en/menu_outfit_tab.xml | 37 ++++--
.../newview/skins/default/xui/en/notifications.xml | 16 +++
6 files changed, 181 insertions(+), 116 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
index d82c453e5f..8cf0479b27 100644
--- a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
@@ -35,7 +35,7 @@
layout="topleft"
name="Folder Wearables Separator" />
<menu_item_call
- label="Replace Current Outfit"
+ label="Replace current outfit"
layout="topleft"
name="Replace Outfit">
<menu_item_call.on_click
@@ -43,7 +43,7 @@
parameter="replaceoutfit" />
</menu_item_call>
<menu_item_call
- label="Add To Current Outfit"
+ label="Add folder items"
layout="topleft"
name="Add To Outfit">
<menu_item_call.on_click
@@ -51,7 +51,7 @@
parameter="addtooutfit" />
</menu_item_call>
<menu_item_call
- label="Remove From Current Outfit"
+ label="Take off folder items"
layout="topleft"
name="Remove From Outfit">
<menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
index 0ca505dd5d..c93a92b2b7 100755
--- a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
@@ -3,7 +3,7 @@
layout="topleft"
name="Outfit">
<menu_item_call
- label="Wear - Replace Current Outfit"
+ label="Replace current outfit"
layout="topleft"
name="wear_replace">
<on_click
@@ -16,7 +16,7 @@
parameter="wear_replace" />
</menu_item_call>
<menu_item_call
- label="Wear - Add to Current Outfit"
+ label="Add outfit items"
layout="topleft"
name="wear_add">
<on_click
@@ -29,7 +29,7 @@
parameter="wear_add" />
</menu_item_call>
<menu_item_call
- label="Take Off - Remove from Current Outfit"
+ label="Take off outfit items"
layout="topleft"
name="take_off">
<on_click
@@ -41,17 +41,60 @@
function="Outfit.OnVisible"
parameter="take_off" />
</menu_item_call>
+ <menu_item_separator/>
<menu_item_call
- label="Image..."
- layout="topleft"
- name="thumbnail">
+ label="Image..."
+ layout="topleft"
+ name="thumbnail">
+ <on_click
+ function="Outfit.Thumbnail" />
+ </menu_item_call>
+ <menu_item_call
+ label="Edit outfit"
+ layout="topleft"
+ name="edit">
+ <on_click
+ function="Outfit.Edit" />
+ <on_visible
+ function="Outfit.OnVisible"
+ parameter="edit" />
+ </menu_item_call>
+ <menu_item_call
+ label="Rename outfit"
+ layout="topleft"
+ name="rename">
+ <on_click
+ function="Outfit.Rename" />
+ <on_enable
+ function="Outfit.OnEnable"
+ parameter="rename" />
+ </menu_item_call>
+ <menu_item_call
+ label="Save to this outfit"
+ layout="topleft"
+ name="save">
+ <on_click
+ function="Outfit.Save" />
+ </menu_item_call>
+ <menu_item_separator>
+ <on_visible
+ function="Outfit.OnVisible"
+ parameter="delete" />
+ </menu_item_separator>
+ <menu_item_call
+ label="Delete outfit"
+ layout="topleft"
+ name="delete">
<on_click
- function="Outfit.Thumbnail" />
+ function="Outfit.Delete" />
+ <on_visible
+ function="Outfit.OnVisible"
+ parameter="delete" />
</menu_item_call>
- <menu_item_separator name="sepatator1" />
+ <menu_item_separator/>
<menu
height="175"
- label="New Clothes"
+ label="New clothes"
layout="topleft"
left_delta="0"
mouse_opaque="false"
@@ -157,7 +200,7 @@
</menu>
<menu
height="85"
- label="New Body Parts"
+ label="New body parts"
layout="topleft"
left_delta="0"
mouse_opaque="false"
@@ -197,35 +240,4 @@
parameter="eyes" />
</menu_item_call>
</menu>
- <menu_item_separator name="sepatator2" />
- <menu_item_call
- label="Edit Outfit"
- layout="topleft"
- name="edit">
- <on_click
- function="Outfit.Edit" />
- <on_visible
- function="Outfit.OnVisible"
- parameter="edit" />
- </menu_item_call>
- <menu_item_call
- label="Rename Outfit"
- layout="topleft"
- name="rename">
- <on_click
- function="Outfit.Rename" />
- <on_enable
- function="Outfit.OnEnable"
- parameter="rename" />
- </menu_item_call>
- <menu_item_call
- label="Delete Outfit"
- layout="topleft"
- name="delete">
- <on_click
- function="Outfit.Delete" />
- <on_visible
- function="Outfit.OnVisible"
- parameter="delete" />
- </menu_item_call>
</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index e650c10603..b8adafbaaf 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -272,7 +272,7 @@
layout="topleft"
name="Folder Wearables Separator" />
<menu_item_call
- label="Replace Current Outfit"
+ label="Replace current outfit"
layout="topleft"
name="Replace Outfit">
<menu_item_call.on_click
@@ -280,7 +280,7 @@
parameter="replaceoutfit" />
</menu_item_call>
<menu_item_call
- label="Add To Current Outfit"
+ label="Add folder items"
layout="topleft"
name="Add To Outfit">
<menu_item_call.on_click
@@ -288,7 +288,7 @@
parameter="addtooutfit" />
</menu_item_call>
<menu_item_call
- label="Remove From Current Outfit"
+ label="Take off folder items"
layout="topleft"
name="Remove From Outfit">
<menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index e216962d12..e7a453766b 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -4,7 +4,7 @@
visible="false"
name="Gear Outfit">
<menu_item_call
- label="Wear - Replace Current Outfit"
+ label="Replace current outfit"
layout="topleft"
name="wear">
<on_click
@@ -17,7 +17,7 @@
parameter="wear" />
</menu_item_call>
<menu_item_call
- label="Wear - Add to Current Outfit"
+ label="Add outfit items"
layout="topleft"
name="wear_add">
<on_click
@@ -25,9 +25,11 @@
<on_enable
function="Gear.OnEnable"
parameter="wear_add" />
+ <on_visible
+ function="Gear.OnVisible"/>
</menu_item_call>
<menu_item_call
- label="Take Off - Remove from Current Outfit"
+ label="Take off outfit items"
layout="topleft"
name="take_off">
<on_click
@@ -39,19 +41,88 @@
function="Gear.OnVisible"
parameter="take_off" />
</menu_item_call>
+ <menu_item_separator name="wear_separator" />
<menu_item_call
label="Image..."
layout="topleft"
name="thumbnail">
+ <on_click
+ function="Gear.Thumbnail" />
+ </menu_item_call>
+ <menu_item_call
+ label="Rename outfit"
+ layout="topleft"
+ name="rename">
+ <on_click
+ function="Gear.Rename" />
+ <on_enable
+ function="Gear.OnEnable"
+ parameter="rename" />
+ <on_visible
+ function="Gear.OnVisible"
+ parameter="rename" />
+ </menu_item_call>
+ <menu_item_call
+ label="Save to this outfit"
+ layout="topleft"
+ name="save">
+ <on_click
+ function="Gear.Save" />
+ <on_visible
+ function="Gear.OnVisible"/>
+ </menu_item_call>
+ <menu_item_separator>
+ <on_visible
+ function="Gear.OnVisible"
+ parameter="delete" />
+ </menu_item_separator>
+ <menu_item_call
+ label="Delete outfit"
+ layout="topleft"
+ name="delete_outfit">
+ <on_click
+ function="Gear.Delete" />
+ <on_enable
+ function="Gear.OnEnable"
+ parameter="delete" />
+ <on_visible
+ function="Gear.OnVisible"
+ parameter="delete" />
+ </menu_item_call>
+ <menu_item_separator>
+ <on_visible
+ function="Gear.OnVisible"/>
+ </menu_item_separator>
+ <menu_item_check
+ label="Sort folders always by name"
+ layout="topleft"
+ name="sort_folders_by_name">
+ <on_click
+ function="Gear.SortByName" />
+ <on_check
+ function="CheckControl"
+ parameter="OutfitGallerySortByName" />
+ </menu_item_check>
+ <menu_item_call
+ label="Expand all folders"
+ layout="topleft"
+ name="expand">
+ <on_click
+ function="Gear.Expand" />
+ </menu_item_call>
+ <menu_item_call
+ label="Collapse all folders"
+ layout="topleft"
+ name="collapse">
<on_click
- function="Gear.Thumbnail" />
+ function="Gear.Collapse" />
</menu_item_call>
- <menu_item_separator name="sepatator1" />
+ <menu_item_separator/>
<!-- copied (with minor modifications) from menu_inventory_add.xml -->
<!-- *TODO: generate dynamically? -->
<menu
height="175"
- label="New Clothes"
+ label="New clothes"
layout="topleft"
left_delta="0"
mouse_opaque="false"
@@ -165,7 +236,7 @@
</menu>
<menu
height="85"
- label="New Body Parts"
+ label="New body parts"
layout="topleft"
left_delta="0"
mouse_opaque="false"
@@ -206,57 +277,4 @@
</menu_item_call>
</menu>
<!-- copied from menu_inventory_add.xml -->
-
- <menu_item_separator name="sepatator2" />
- <menu_item_call
- label="Expand all folders"
- layout="topleft"
- name="expand">
- <on_click
- function="Gear.Expand" />
- </menu_item_call>
- <menu_item_call
- label="Collapse all folders"
- layout="topleft"
- name="collapse">
- <on_click
- function="Gear.Collapse" />
- </menu_item_call>
- <menu_item_call
- label="Rename Outfit"
- layout="topleft"
- name="rename">
- <on_click
- function="Gear.Rename" />
- <on_enable
- function="Gear.OnEnable"
- parameter="rename" />
- <on_visible
- function="Gear.OnVisible"
- parameter="rename" />
- </menu_item_call>
- <menu_item_call
- label="Delete Outfit"
- layout="topleft"
- name="delete_outfit">
- <on_click
- function="Gear.Delete" />
- <on_enable
- function="Gear.OnEnable"
- parameter="delete" />
- <on_visible
- function="Gear.OnVisible"
- parameter="delete" />
- </menu_item_call>
- <menu_item_separator name="sepatator3" />
- <menu_item_check
- label="Sort Folders Always by Name"
- layout="topleft"
- name="sort_folders_by_name">
- <on_click
- function="Gear.SortByName" />
- <on_check
- function="CheckControl"
- parameter="OutfitGallerySortByName" />
- </menu_item_check>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
index 8c8bb29baf..522e41df42 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
@@ -3,7 +3,7 @@
layout="topleft"
name="Outfit">
<menu_item_call
- label="Wear - Replace Current Outfit"
+ label="Replace current outfit"
layout="topleft"
name="wear_replace">
<on_click
@@ -16,7 +16,7 @@
parameter="wear_replace" />
</menu_item_call>
<menu_item_call
- label="Wear - Add to Current Outfit"
+ label="Add outfit items"
layout="topleft"
name="wear_add">
<on_click
@@ -29,7 +29,7 @@
parameter="wear_add" />
</menu_item_call>
<menu_item_call
- label="Take Off - Remove from Current Outfit"
+ label="Take off outfit items"
layout="topleft"
name="take_off">
<on_click
@@ -41,19 +41,26 @@
function="Outfit.OnVisible"
parameter="take_off" />
</menu_item_call>
+ <menu_item_separator />
<menu_item_call
- label="Edit Outfit"
- layout="topleft"
- name="edit">
+ label="Image..."
+ layout="topleft"
+ name="thumbnail">
+ <on_click
+ function="Outfit.Thumbnail" />
+ </menu_item_call>
+ <menu_item_call
+ label="Edit outfit"
+ layout="topleft"
+ name="edit">
<on_click
function="Outfit.Edit" />
<on_visible
function="Outfit.OnVisible"
parameter="edit" />
</menu_item_call>
- <menu_item_separator />
<menu_item_call
- label="Rename Outfit"
+ label="Rename outfit"
layout="topleft"
name="rename">
<on_click
@@ -63,7 +70,19 @@
parameter="rename" />
</menu_item_call>
<menu_item_call
- label="Delete Outfit"
+ label="Save to this outfit"
+ layout="topleft"
+ name="save">
+ <on_click
+ function="Outfit.Save" />
+ </menu_item_call>
+ <menu_item_separator>
+ <on_visible
+ function="Outfit.OnVisible"
+ parameter="delete" />
+ </menu_item_separator>
+ <menu_item_call
+ label="Delete outfit"
layout="topleft"
name="delete">
<on_click
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 204fead7e0..d0c73f0973 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12098,5 +12098,21 @@ Would you like to save them first?
notext="No"
yestext="Yes"/>
</notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="ConfirmOverwriteOutfit"
+ type="alertmodal">
+ <unique/>
+This will replace the items in the
+selected outfit with the items you
+are wearing now.
+ <tag>confirm</tag>
+ <usetemplate
+ ignoretext="Confirm before overwriting outfit"
+ name="okcancelignore"
+ notext="Cancel"
+ yestext="Save"/>
+ </notification>
</notifications>
--
cgit v1.2.3
From be823ebc0a54313dbfb9021a8c4f546784187bc3 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 1 Nov 2023 22:23:55 +0200
Subject: SL-20462 show two decimal digits for Density Exponent
---
indra/newview/skins/default/xui/en/panel_settings_water.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 1aa42af3a8..45e611022a 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -65,7 +65,7 @@
Density Exponent:
</text>
<slider
- decimal_digits="1"
+ decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
--
cgit v1.2.3
From e4b9cbcdd3195b9841864463ea6ca8c02105a06d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 6 Nov 2023 23:15:16 +0200
Subject: SL-20566 Allow removal of a teleport history locations
---
.../skins/default/xui/en/menu_teleport_history_item.xml | 13 +++++++++++++
1 file changed, 13 insertions(+)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
index 153e5a70a9..9bbfdd4291 100644
--- a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
@@ -49,4 +49,17 @@
function="TeleportHistory.GearMenu.Enable"
parameter="copy_slurl" />
</menu_item_call>
+ <menu_item_separator
+ layout="topleft" />
+ <menu_item_call
+ label="Remove from history"
+ layout="topleft"
+ name="remove_from_history">
+ <on_click
+ function="TeleportHistory.GearMenu.Action"
+ parameter="remove" />
+ <on_enable
+ function="TeleportHistory.GearMenu.Enable"
+ parameter="remove" />
+ </menu_item_call>
</toggleable_menu>
--
cgit v1.2.3
From b2b1aeffc72fda7b2857f2dd9069d65b23bd7021 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 6 Dec 2023 14:11:33 +0200
Subject: SL-20693 FIXED Classifieds publish price field misinterprets invalid
values
---
indra/newview/skins/default/xui/en/floater_publish_classified.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
index 84e0b489d0..3e68011b6c 100644
--- a/indra/newview/skins/default/xui/en/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
@@ -25,6 +25,7 @@ Remember, Classified fees are non-refundable.
</text>
<spinner
decimal_digits="0"
+ allow_digits_only="true"
follows="left|top"
font="SansSerif"
halign="left"
@@ -36,7 +37,6 @@ Remember, Classified fees are non-refundable.
layout="topleft"
left="15"
value="50"
- min_val="50"
max_val="999999"
name="price_for_listing"
top_pad="10"
--
cgit v1.2.3
From 61935a13f41b92c652e677bbfd58725ce826c649 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 21 Mar 2024 07:34:51 +0100
Subject: Add Develop menu option 'Debug Camera Controls'
---
.../skins/default/xui/en/floater_camera.xml | 24 +++++++++++++++++++---
indra/newview/skins/default/xui/en/menu_viewer.xml | 8 ++++++++
2 files changed, 29 insertions(+), 3 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 9deb38e3af..8774b12e2b 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -138,13 +138,13 @@
</panel>
</panel>
<panel
- follows="all"
+ follows="left|top"
height="102"
layout="topleft"
left_pad="2"
+ right="-2"
name="buttons_panel"
- top="22"
- width="212">
+ top="22">
<panel_camera_item
name="front_view"
tool_tip="Front View"
@@ -253,4 +253,22 @@
function="CameraPresets.Save"/>
</button>
</panel>
+ <panel
+ name="viewer_camera_info"
+ left="0"
+ top="135"
+ width="400"
+ height="130"
+ border="true"
+ visible="false"
+ background_visible="true"/>
+ <panel
+ name="agent_camera_info"
+ left="0"
+ top="265"
+ width="400"
+ height="130"
+ border="true"
+ visible="false"
+ background_visible="true"/>
</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 6444ea2540..b3bf977df2 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3633,6 +3633,14 @@ function="World.EnvPreset"
<menu_item_check.on_click
function="Advanced.ToggleDebugUnicode" />
</menu_item_check>
+ <menu_item_check
+ label="Debug Camera Controls"
+ name="Debug Camera Controls">
+ <menu_item_check.on_check
+ function="Advanced.CheckDebugCamera" />
+ <menu_item_check.on_click
+ function="Advanced.ToggleDebugCamera" />
+ </menu_item_check>
<menu_item_check
label="Debug Name Tooltips"
name="Debug Name Tooltips">
--
cgit v1.2.3
From f815b015cecda18098dd2d16f65682a37e1bff7c Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 26 Mar 2024 03:19:06 +0100
Subject: secondlife/jira-archive-internal#69593 Avatar is upside down when
viewed from below
---
indra/newview/skins/default/xui/en/floater_camera.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 8774b12e2b..93cfdf6030 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -258,16 +258,16 @@
left="0"
top="135"
width="400"
- height="130"
+ height="150"
border="true"
visible="false"
background_visible="true"/>
<panel
name="agent_camera_info"
left="0"
- top="265"
+ top="285"
width="400"
- height="130"
+ height="150"
border="true"
visible="false"
background_visible="true"/>
--
cgit v1.2.3
From 73324129820075c9db2db5a0108a7d1c1403f459 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 5 Apr 2024 02:35:07 +0300
Subject: viewer#676 Use attacment info for rez state reporting
---
indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++++++++
1 file changed, 10 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 d580369ab2..bc2ec6c984 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3916,6 +3916,16 @@ function="World.EnvPreset"
<menu_item_check.on_click
function="Advanced.ToggleDebugCharacterVis" />
</menu_item_check>
+ <menu_item_check
+ label="Debug Character Rez State"
+ name="Debug Character Rez State">
+ <menu_item_check.on_check
+ function="CheckControl"
+ parameter="NameTagDebugAVRezState" />
+ <menu_item_check.on_click
+ function="ToggleControl"
+ parameter="NameTagDebugAVRezState" />
+ </menu_item_check>
<menu_item_check
label="Show Collision Skeleton"
name="Show Collision Skeleton">
--
cgit v1.2.3
From 6d6eabca44d08d5b97bfe3e941d2b9687c2246ea Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 20 May 2024 17:16:18 +0300
Subject: triage#59 Render Friends Only option
An option for performance testing, video recording or taking photos, so
that unexpected people won't appear in your photos or tests.
---
indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++++++++
1 file changed, 10 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 a88e4757af..49f5dfec04 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3843,6 +3843,16 @@ function="World.EnvPreset"
function="ToggleControl"
parameter="AllowSelectAvatar" />
</menu_item_check>
+ <menu_item_check
+ label="Render Only Friends"
+ name="Render Only Friends">
+ <menu_item_check.on_check
+ function="CheckControl"
+ parameter="RenderAvatarFriendsOnly" />
+ <menu_item_check.on_click
+ function="ToggleControl"
+ parameter="RenderAvatarFriendsOnly" />
+ </menu_item_check>
</menu>
<menu
create_jump_keys="true"
--
cgit v1.2.3