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

.hgtags

autobuild.xml

doc/contributions.txt

indra/cmake/NVAPI.cmake

indra/llcharacter/llbvhconsts.h

indra/llcharacter/llmotioncontroller.cpp

indra/llcharacter/llmotioncontroller.h

indra/llmessage/llurlrequest.cpp

indra/llmessage/llxfermanager.cpp

indra/llwindow/llwindow.cpp

indra/llwindow/llwindow.h

indra/llwindow/llwindowsdl.cpp

indra/media_plugins/webkit/windows_volume_catcher.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

...newview/app_settings/shaders/class1/objects/previewF.glsl

...newview/app_settings/shaders/class1/objects/previewV.glsl

indra/newview/llagentcamera.cpp

indra/newview/llappviewer.cpp

indra/newview/llappviewerwin32.cpp