diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-04-18 00:19:35 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-04-18 00:19:35 +0000 |
| commit | 83e0af9f95c39b1385cd63df46874b040a408af6 (patch) | |
| tree | 43cc4baf9b75fde5328b21bf51a966e17c68c141 /indra/newview/skins | |
| parent | 5f8cca95f8890d22496932827626f6c437d2b188 (diff) | |
| parent | cc70bf9ea04b6c934fec23d693d6a5b76eaf6df6 (diff) | |
Merged in maxim_productengine/viewer-eep (pull request #353)
SL-10957 [EEP] Add Reset button to revert to shared environment
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_adjust_environment.xml | 14 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 15 |
2 files changed, 26 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml index e2cf809c9c..fc356c10c7 100644 --- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml +++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml @@ -5,14 +5,14 @@ save_rect="false" title="Personal Lighting" width="845" - height="225" + height="230" min_width="500" min_height="225" single_instance="true" can_resize="false"> <layout_stack name="outer_stack" width="845" - height="212" + height="220" follows="all" animate="false" top="0" @@ -84,6 +84,16 @@ name="blue_density" top_pad="5" width="60"/> + <button + follows="left|top" + height="23" + label="Reset" + tool_tip="Close and reset to Shared Environment" + layout="topleft" + name="btn_reset" + left_delta="-2" + top_pad="10" + width="100"/> <text follows="right|top" height="10" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 931e44b319..fa5b6062df 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -11405,7 +11405,20 @@ Are you sure you want to continue? notext="No" yestext="Yes"/> </notification> - + + <notification + icon="alertmodal.tga" + name="PersonalSettingsConfirmReset" + type="alertmodal"> + You are about to remove all applied Personal lighting settings. + Are you sure you want to continue? + <tag>confirm</tag> + <usetemplate + name="okcancelbuttons" + notext="No" + yestext="Yes"/> + </notification> + <notification icon="alertmodal.tga" name="SettingsMakeNoTrans" |