diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-16 17:17:01 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-16 17:17:01 +0300 |
| commit | cccca566bd2365c88cca819729c5432af9dfa52f (patch) | |
| tree | 8d81a737b1c6bf087a4d7330f1948155f554fcf2 /indra/newview/skins/default | |
| parent | 0d7ea0e5abb4df0a18f1d8b73cce81dc2070afad (diff) | |
STORM-1245 WIP Reimplementing management of local presets according to the new spec.
User environment preferences are now persistent.
TODO: Implement applying region env. settings.
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 11 |
2 files changed, 2 insertions, 12 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 910106a6b5..04a0350283 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -505,8 +505,9 @@ function="World.EnvSettings" parameter="midnight" /> </menu_item_call> + <menu_item_separator/> <menu_item_call - label="Estate Time" + label="Use Region Sun" name="Revert to Region Default"> <menu_item_call.on_click function="World.EnvSettings" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 2e0f3d9cdc..3c8daec68a 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4865,17 +4865,6 @@ Sorry, the settings couldn't be applied to the region. Leaving the region and t <notification functor="GenericAcknowledge" icon="alertmodal.tga" - name="EnvLockedUsingRegion" - type="alertmodal"> -You cannot load environment presets while you are using the region's environment settings. To manually configure your environment setings, select the Environment Editor and uncheck "Use Region Environment Settings." - <usetemplate - name="okbutton" - yestext="OK"/> - </notification> - - <notification - functor="GenericAcknowledge" - icon="alertmodal.tga" name="EnvEditExternalCancel" type="alertmodal"> Warning: an update to the environment settings you were just editing was received, either because settings you recently committed have just been applied or because someone else with editing permissions updated the region's environment settings. In order to avoid overwriting this update, your changes have been cancelled; concurrent edits are not permitted. Please try again. |