diff options
author | Oz Linden <oz@lindenlab.com> | 2011-08-25 13:27:52 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-08-25 13:27:52 -0400 |
commit | 4057afd29161ad9cb69674ee608e48bc9e46a559 (patch) | |
tree | 058c53cb19d9b3e85fb0f9b70623c563704cdf17 /indra/newview/skins/minimal/xui/en | |
parent | 0f1dea30f827f920d2323d9450826f1a4baaa10b (diff) | |
parent | 7c222dfd136a4bb97700b390f8adbef6fe67cf5d (diff) |
merge changes for storm-1268
Diffstat (limited to 'indra/newview/skins/minimal/xui/en')
-rw-r--r-- | indra/newview/skins/minimal/xui/en/notifications.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/minimal/xui/en/panel_status_bar.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/skins/minimal/xui/en/notifications.xml b/indra/newview/skins/minimal/xui/en/notifications.xml index 84da9472cc..7b7cdb5fc6 100644 --- a/indra/newview/skins/minimal/xui/en/notifications.xml +++ b/indra/newview/skins/minimal/xui/en/notifications.xml @@ -24,7 +24,7 @@ icon="notify.tga" name="ObjectGiveItem" type="offer"> - An object named <nolink>[OBJECTFROMNAME]</nolink> owned by [NAME_SLURL] is offering you [ITEM_SLURL]. Using this item requires you to switch to Advanced mode where you will find the item in your Inventory. To switch to Advanced mode, quit and restart this application and change the mode setting on the login screen. + An object named <nolink>[OBJECTFROMNAME]</nolink> owned by [NAME_SLURL] is offering you <nolink>[ITEM_SLURL]</nolink>. Using this item requires you to switch to Advanced mode where you will find the item in your Inventory. To switch to Advanced mode, quit and restart this application and change the mode setting on the login screen. <form name="form"> <button index="0" diff --git a/indra/newview/skins/minimal/xui/en/panel_status_bar.xml b/indra/newview/skins/minimal/xui/en/panel_status_bar.xml index c816d97eee..42e6f30d48 100644 --- a/indra/newview/skins/minimal/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/minimal/xui/en/panel_status_bar.xml @@ -37,9 +37,9 @@ follows="right|top" image_color="0 0 0 0" hover_glow_amount="0" - left="2" + left="5" top="7" - width="50" + width="55" height="18" label="Mode ▼" tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features." |