Automated merge with http://hg.secondlife.com/viewer-development

indra/llcommon/lleventapi.cpp

indra/llcommon/lleventapi.h

indra/llcommon/llevents.cpp

indra/llui/CMakeLists.txt

indra/llui/llview.cpp

indra/llui/llview.h

indra/llui/llviewinject.cpp

indra/llui/llviewinject.h

indra/llwindow/CMakeLists.txt

indra/llwindow/llwindow.cpp

indra/llwindow/llwindow.h

indra/llwindow/llwindowlistener.cpp

indra/llxml/llcontrol.h

indra/newview/CMakeLists.txt

indra/newview/llviewercontrollistener.cpp

indra/newview/llviewercontrollistener.h

indra/newview/llviewerwindow.cpp

indra/newview/llviewerwindow.h

indra/newview/llwindowlistener.cpp

indra/newview/llwindowlistener.h