diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2009-11-16 13:58:18 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2009-11-16 13:58:18 -0800 |
| commit | 07cbace05f84dc42a80fa782d90862e5c0bf404b (patch) | |
| tree | 768f8e025fe8448e09ee39986690ffe9982f4b20 /indra/newview/skins/default/xui/en | |
| parent | 7cc233b3a83bd82f7a42bf1f64901d2578beaf2c (diff) | |
| parent | f1da0a4ff4e6de98422f0b4534034120bec558b7 (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -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 9fe03859bb..56cb54c975 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" /> |