merge fix for STORM-616

.hgtags

BuildParams

doc/contributions.txt

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/llhudnametag.cpp

indra/newview/llimview.cpp

indra/newview/llpanelmaininventory.cpp

indra/newview/llpanelmaininventory.h

indra/newview/llviewercontrol.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewerwindow.cpp

indra/newview/llvowater.cpp