automated merge from viewer-development

doc/contributions.txt

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/newview/installers/windows/installer_template.nsi

indra/newview/llagentwearables.cpp

indra/newview/llchatbar.cpp

indra/newview/llnearbychatbar.cpp

indra/newview/llsidetray.cpp

indra/newview/llsidetray.h

indra/newview/llviewerwindow.cpp

indra/newview/llvoavatar.cpp

indra/newview/llvoavatar.h

indra/newview/llvoavatarself.cpp

indra/newview/skins/default/colors.xml

...fault/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png

...ns/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png

...ult/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png

.../default/textures/taskpanel/Sidebar_Icon_Undock_Press.png

indra/newview/skins/default/textures/textures.xml

indra/newview/skins/default/xui/en/floater_side_bar_tab.xml