diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2009-11-16 13:55:51 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2009-11-16 13:55:51 -0800 |
| commit | f1da0a4ff4e6de98422f0b4534034120bec558b7 (patch) | |
| tree | 6ed802fc19200d52d9ad9ee5a57971007054480d /indra/newview/skins | |
| parent | fc6b3d4caadf2dfe11504a0d3fa2a96f6135320b (diff) | |
EXT-1478 Tool-tip background and border colors are being ignored - hooked up xml
EXT-2237 Preferences > Alerts shows "$ignoretext" in the list
EXT-1582 The current edit coordinates are displaced from their background
EXT-1466 Change Mouselook text "Press ESC to return to World View" to match stylesheet
reviewed by James
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/inspector.xml | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/tool_tip.xml | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index ff0cd7ffeb..d6e1c5edc5 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -581,9 +581,10 @@ Multiple faces are currently selected. If you continue this action, separate instances of media will be set on multiple faces of the object. To place the media on only one face, choose Select Texture and click on the desired face of that object then click Add. <usetemplate - name="okcancelignore" - notext="Cancel" - yestext="OK"/> + ignoretext="Media will be set on multiple selected faces" + name="okcancelignore" + notext="Cancel" + yestext="OK"/> </notification> <notification diff --git a/indra/newview/skins/default/xui/en/widgets/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml index 61950d7554..f631ef3957 100644 --- a/indra/newview/skins/default/xui/en/widgets/inspector.xml +++ b/indra/newview/skins/default/xui/en/widgets/inspector.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- See also settings.xml UIFloater* settings for configuration --> <inspector name="inspector" - bg_opaque_color="ToolTipBgColor" + bg_opaque_color="DkGray_66" background_visible="true" bg_opaque_image="none" + background_opaque="true" bg_alpha_image="none" /> diff --git a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml index 6b49f832fd..c209c26c92 100644 --- a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml +++ b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml @@ -5,6 +5,7 @@ padding="4" wrap="true" font="SansSerif" - bg_opaque_color="ToolTipBgColor" + bg_opaque_image="Tooltip" + background_opaque="true" background_visible="true" /> |