merge fix for STORM-316

.hgtags

BuildParams

indra/newview/app_settings/settings.xml

indra/newview/featuretable.txt

indra/newview/featuretable_linux.txt

indra/newview/featuretable_mac.txt

indra/newview/featuretable_xp.txt

indra/newview/lldrawpoolwater.cpp

indra/newview/lldrawpoolwater.h

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llviewercontrol.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewermessage.cpp

indra/newview/llvowater.cpp

indra/newview/skins/default/xui/da/floater_bumps.xml

indra/newview/skins/default/xui/da/floater_pay.xml

indra/newview/skins/default/xui/da/floater_pay_object.xml

indra/newview/skins/default/xui/da/notifications.xml

indra/newview/skins/default/xui/da/strings.xml