Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0

indra/llui/lldockcontrol.cpp

indra/llui/lldockcontrol.h

indra/llui/llscrolllistctrl.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llpanelnearbymedia.cpp

indra/newview/llpanelnearbymedia.h

indra/newview/llpanelvolumepulldown.cpp

indra/newview/llstatusbar.cpp

indra/newview/llstatusbar.h

indra/newview/llviewerfloaterreg.cpp

indra/newview/llviewermedia.cpp

indra/newview/llviewermedia.h

indra/newview/llviewerparcelmgr.cpp

...view/skins/default/textures/windows/Flyout_Pointer_Up.png

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

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