From f78cb1c4ff7608a05976d6be7b568fbbbf36202b Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Fri, 20 Aug 2021 11:19:31 -0700
Subject: [PATCH] DRTVWR-534: collection of minor UI tweaks and fixes via XUI
changes
---
.../default/xui/en/floater_360capture.xml | 53 +++++++++++--------
.../skins/default/xui/en/menu_viewer.xml | 2 +-
.../newview/skins/default/xui/en/strings.xml | 4 +-
3 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/indra/newview/skins/default/xui/en/floater_360capture.xml b/indra/newview/skins/default/xui/en/floater_360capture.xml
index c2959b9853c..f24639d81a7 100644
--- a/indra/newview/skins/default/xui/en/floater_360capture.xml
+++ b/indra/newview/skins/default/xui/en/floater_360capture.xml
@@ -7,7 +7,7 @@
name="360capture"
help_topic="360capture"
save_rect="true"
- title="360 Capture"
+ title="360 CAPTURE"
width="800">
<panel layout="topleft"
background_visible="true"
@@ -18,7 +18,7 @@
bg_opaque_color="0.195 0.195 0.195 1"
background_opaque="true"
height="400"
- name="ui_panel">
+ name="ui_panel_left">
<text
follows="top|left|right"
height="16"
@@ -89,7 +89,7 @@
width="100"/>
<button follows="left|top"
height="20"
- label="Capture 360 image"
+ label="Create 360 image"
layout="topleft"
left="10"
name="capture_button"
@@ -97,28 +97,39 @@
width="180" />
<button follows="left|top"
height="20"
- label="Save as.."
+ label="Save as..."
layout="topleft"
left="10"
name="save_local_button"
top_delta="35"
width="180" />
</panel>
- <web_browser top="0"
- follows="all"
- bg_opaque_color="0.225 0.225 0.225 1"
- left="200"
- width="600"
- height="380"
- name="360capture_contents"
- trusted_content="true" />
- <text follows="bottom"
- layout="topleft"
- name="statusbar"
- height="17"
- left="210"
- top="383"
- width="600">
- Click and drag on the image to pan
- </text>
+ <panel layout="topleft"
+ background_visible="true"
+ top="0"
+ follows="all"
+ left="200"
+ width="600"
+ bg_opaque_color="0.195 0.195 0.195 1"
+ background_opaque="true"
+ height="400"
+ name="ui_panel_right">
+ <web_browser top="10"
+ follows="all"
+ bg_opaque_color="0.225 0.225 0.225 1"
+ left="0"
+ width="590"
+ height="368"
+ name="360capture_contents"
+ trusted_content="true" />
+ <text follows="bottom"
+ layout="topleft"
+ name="statusbar"
+ height="17"
+ left="0"
+ top="382"
+ width="590">
+ Click and drag on the image to pan
+ </text>
+ </panel>
</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 52afe9164e3..24d06722b90 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -735,7 +735,7 @@
</menu_item_call>
<menu_item_call
- label="Capture 360"
+ label="360 snapshot"
name="Capture 360"
shortcut="control|alt|shift|s">
<menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ae04a7c2b4b..db813a56b1c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4125,7 +4125,7 @@ Try enclosing path to the editor with double quotes.
<!-- commands -->
<string
-name="Command_360_Capture_Label">360 Capture</string>
+name="Command_360_Capture_Label">360 snapshot</string>
<string name="Command_AboutLand_Label">About land</string>
<string name="Command_Appearance_Label">Outfits</string>
<string name="Command_Avatar_Label">Complete avatars</string>
@@ -4157,7 +4157,7 @@ name="Command_360_Capture_Label">360 Capture</string>
<string name="Command_Voice_Label">Voice settings</string>
<string
-name="Command_360_Capture_Tooltip">Capture a 360 panorama image</string>
+name="Command_360_Capture_Tooltip">Capture a 360 equirectangular image</string>
<string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string>
<string name="Command_Appearance_Tooltip">Change your avatar</string>
<string name="Command_Avatar_Tooltip">Choose a complete avatar</string>
--
GitLab