summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrichard <none@none>2009-11-04 11:58:39 -0800
committerrichard <none@none>2009-11-04 11:58:39 -0800
commitc3e9536b6fae9fbd751d4a63e243f502e056175d (patch)
treeadf2054146a3244f236f6b39015ae7a530691bbe
parentad25be8af388ee38c2f0af731d30a6336caf3ad5 (diff)
updated floater_test_textbox to test case of texbox too big for its text
removed picture_style from sidepanel_object_info.xml made mime_type error notification unique on mime type reviewed by Leyla
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_textbox.xml4
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml3
2 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
index f39d27761c..9e2e9e74e3 100644
--- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
@@ -145,11 +145,11 @@
<text
type="string"
length="1"
- bottom="390"
+ height="60"
label="N"
layout="topleft"
left="10"
- name="centered_text"
+ name="left_aligned_text"
width="380"
halign="left"
text_color="1 1 1 0.7"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index babed28f10..8679e87f49 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4629,6 +4629,9 @@ If you want to view streaming media on parcels that support it you should go to
name="NoPlugin"
type="notify">
No Media Plugin was found to handle the "[MIME_TYPE]" mime type. Media of this type will be unavailable.
+ <unique>
+ <context key="MIME_TYPE" />
+ </unique>
</notification>
<notification
icon="alertmodal.tga"