merge changes for storm-1572

master
Oz Linden 2011-08-31 09:05:49 -04:00
commit ee4fc00a27
2 changed files with 4 additions and 2 deletions

View File

@ -568,6 +568,7 @@ Jonathan Yap
STORM-1462
STORM-1459
STORM-1522
STORM-1572
STORM-1574
Kadah Coba
STORM-1060

View File

@ -77,15 +77,16 @@
top="0"
width="55" />
</panel>
<!-- UTF 9660 code in label below is a down-pointing filled-in triangle -->
<menu_button
follows="right|top"
image_color="0 0 0 0"
hover_glow_amount="0"
left_pad="5"
top="0"
top="2"
width="55"
height="18"
label="Mode "
label="Mode &#9660;"
tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
menu_filename="menu_mode_change.xml"
/>