summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_snapshot.xml16
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml12
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml17
3 files changed, 38 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index fe77256f52..e6b780728c 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -5,7 +5,7 @@
can_minimize="true"
can_resize="false"
can_close="true"
- height="455"
+ height="475"
layout="topleft"
name="Snapshot"
single_instance="true"
@@ -115,7 +115,7 @@
top_delta="0"
width="31" />
<panel
- height="159"
+ height="179"
layout="topleft"
follows="top|left"
left="0"
@@ -193,6 +193,14 @@
top_pad="1"
width="180"
name="auto_snapshot_check" />
+ <check_box
+ label="No post-processing"
+ layout="topleft"
+ height="16"
+ left="10"
+ top_pad="1"
+ width="180"
+ name="no_post_check" />
<text
type="string"
length="1"
@@ -391,8 +399,8 @@
name="thumbnail_placeholder"
top="23"
left="215"
- width="400"
- height="400"
+ width="420"
+ height="420"
follows="top|left"/>
<view_border
bevel_style="in"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f5228e73b8..2c26296547 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1553,7 +1553,7 @@ function="World.EnvPreset"
<menu_item_separator/>
<menu_item_check
- label="No Post"
+ label="No Post-processing"
name="No Post">
<menu_item_check.on_check
control="RenderDisablePostProcessing" />
@@ -2170,6 +2170,16 @@ function="World.EnvPreset"
function="Advanced.ToggleRenderType"
parameter="bump" />
</menu_item_check>
+ <menu_item_check
+ label="PBR"
+ name="Rendering Type PBR">
+ <menu_item_check.on_check
+ function="Advanced.CheckRenderType"
+ parameter="pbr" />
+ <menu_item_check.on_click
+ function="Advanced.ToggleRenderType"
+ parameter="pbr" />
+ </menu_item_check>
</menu>
<menu
create_jump_keys="true"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 134894e6ce..1703e17060 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1535,7 +1535,7 @@ Delete pick &lt;nolink&gt;[PICK]&lt;/nolink&gt;?
icon="alert.tga"
name="ProfileUnsavedChanges"
type="alertmodal">
- You have usaved changes.
+ You have unsaved changes.
<tag>confirm</tag>
<tag>save</tag>
<usetemplate
@@ -6179,7 +6179,7 @@ Are you sure you want to delete them?
Delete the image for this item? There is no undo.
<tag>confirm</tag>
<usetemplate
- ignoretext="Don't show me this again"
+ ignoretext="Warn me that thumbnail will be permanently removed"
name="okcancelignore"
notext="Cancel"
yestext="Delete"/>
@@ -7015,6 +7015,19 @@ Please try again.
</notification>
<notification
+ icon="alertmodal.tga"
+ name="CantSelectReflectionProbe"
+ type="alertmodal">
+ <unique/>
+ You have placed a reflection probe, but 'Select Reflection Probes' is disabled. To be able to select reflection probes, check Build &gt; Options &gt; Select Reflection Probes.
+ <tag>confirm</tag>
+ <usetemplate
+ ignoretext="Warn if Reflection Probes selection is disabled."
+ name="okignore"
+ yestext="OK"/>
+ </notification>
+
+ <notification
icon="notifytip.tga"
name="ScriptMissing"
type="notifytip">