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

indra/cmake/DragDrop.cmake

indra/llwindow/CMakeLists.txt

indra/llwindow/lldragdropwin32.cpp

indra/llwindow/lldragdropwin32.h

indra/llwindow/llwindowcallbacks.cpp

indra/llwindow/llwindowcallbacks.h

indra/llwindow/llwindowmacosx.cpp

indra/llwindow/llwindowmacosx.h

indra/llwindow/llwindowwin32.cpp

indra/llwindow/llwindowwin32.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llpanellogin.cpp

indra/newview/llpanellogin.h

indra/newview/llviewerwindow.cpp

indra/newview/llviewerwindow.h