Automated merge with ssh://bitbucket.org/lindenlab/viewer-release

indra/llui/llscrolllistctrl.cpp

indra/llui/llsliderctrl.cpp

indra/llui/llstatbar.h

indra/llui/lltextvalidate.cpp

indra/llui/lltimectrl.cpp

indra/llui/lluictrlfactory.h

indra/llui/llview.cpp

indra/llui/llxuiparser.cpp

indra/llvfs/lldiriterator.cpp

indra/llvfs/llvfs_objc.h

indra/llvfs/llvfs_objc.mm

indra/llwindow/llopenglview-objc.mm

indra/llwindow/llwindowmacosx.cpp

indra/llxml/llxmlnode.cpp

indra/lscript/lscript_execute/lscript_readlso.cpp

indra/media_plugins/example/media_plugin_example.cpp

indra/newview/CMakeLists.txt

indra/newview/llagent.cpp

indra/newview/llagent.h

indra/newview/llagentcamera.cpp