svn merge -r109009:109164 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22

indra/newview/llappviewer.cpp

indra/newview/llviewerdisplay.cpp

indra/newview/llwindebug.cpp

indra/newview/skins/default/xui/de/floater_about.xml

...a/newview/skins/default/xui/de/panel_group_land_money.xml

indra/newview/skins/default/xui/fr/floater_about.xml

...a/newview/skins/default/xui/fr/panel_group_land_money.xml

indra/newview/skins/default/xui/ja/floater_about.xml

indra/newview/skins/default/xui/ja/floater_about_land.xml

indra/newview/skins/default/xui/ja/floater_buy_land.xml

indra/newview/skins/default/xui/ja/floater_land_holdings.xml

indra/newview/skins/default/xui/ja/floater_sell_land.xml

indra/newview/skins/default/xui/ja/floater_top_objects.xml

indra/newview/skins/default/xui/ja/panel_group_general.xml

...a/newview/skins/default/xui/ja/panel_group_land_money.xml

indra/newview/skins/default/xui/ja/panel_group_notices.xml

indra/newview/skins/default/xui/ja/panel_group_roles.xml

...ewview/skins/default/xui/ja/panel_preferences_general.xml

indra/newview/skins/default/xui/pl/floater_about_land.xml

indra/newview/skins/default/xui/pl/floater_beacons.xml