diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-09 19:00:48 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-09 19:00:48 +0000 |
| commit | ac6d2b09c048d8589c572acb2965a0643b07d5ce (patch) | |
| tree | 4592bf63d6fc464c9e1a961e4b64af4233ab93bf /indra/newview/skins | |
| parent | c2cbb40a0eecb1c3b4a21ffa4d169f23f1e7006b (diff) | |
| parent | 83b508a656aebedff915b2fdcd292432a8aaa7b2 (diff) | |
Merged in andreykproductengine/maint-eep2 (pull request #137)
SL-9746 [EEP] Local Texture options should work with EEP
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Diffstat (limited to 'indra/newview/skins')
4 files changed, 27 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml index 4384c01033..a11a2c1200 100644 --- a/indra/newview/skins/default/xui/en/floater_my_environments.xml +++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml @@ -102,7 +102,7 @@ background_visible="true" bg_alpha_color="DkGray2" border="true"> - <asset_filtered_inv_panel + <inventory_panel left="0" top="0" right="-1" @@ -110,8 +110,7 @@ allow_multi_select="false" follows="all" layout="topleft" - name="pnl_settings" - filter_asset_type="settings"/> + name="pnl_settings"/> </panel> </layout_panel> <layout_panel diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml index 7cc2c517ca..2862d1ae37 100644 --- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml @@ -57,7 +57,7 @@ bottom="-2" background_visible="true" bg_alpha_color="DkGray2"> - <asset_filtered_inv_panel + <inventory_panel allow_multi_select="false" suppress_folder_menu="true" bg_visible="true" @@ -68,8 +68,7 @@ name="pnl_inventory" top="1" right="-4" - bottom="-1" - filter_asset_type="settings" /> + bottom="-1" /> </panel> </layout_panel> <layout_panel name="temp" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 69503cdbf2..23e1701dc6 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6072,6 +6072,22 @@ Sorry, the settings couldn't be applied to the region. Reason: [FAIL_REASON] </notification> <notification + icon="alertmodal.tga" + name="WLLocalTextureDayBlock" + type="alertmodal"> +A Local texture is in use on track [TRACK], frame #[FRAMENO] ([FRAME]%) in field [FIELD]. +Settings may not be saved using local textures. + </notification> + + <notification + icon="alertmodal.tga" + name="WLLocalTextureFixedBlock" + type="alertmodal"> +A local texture is in use in field [FIELD]. +Settings may not be saved using local textures. + </notification> + + <notification functor="GenericAcknowledge" icon="alertmodal.tga" name="EnvCannotDeleteLastDayCycleKey" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 8681c867bd..39c2cb79ad 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2782,6 +2782,13 @@ If you continue to receive this message, please contact Second Life support for <string name="RegionSettings">Region Settings</string> <string name="NoEnvironmentSettings">This Region does not support environmental settings.</string> + <string name="EnvironmentSun">Sun</string> + <string name="EnvironmentMoon">Moon</string> + <string name="EnvironmentBloom">Bloom</string> + <string name="EnvironmentCloudNoise">Cloud Noise</string> + <string name="EnvironmentNormalMap">Normal Map</string> + <string name="EnvironmentTransparent">Transparent</string> + <!-- panel classified --> <string name="ClassifiedClicksTxt">Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile</string> <string name="ClassifiedUpdateAfterPublish">(will update after publish)</string> |