merge changes for storm-477

indra/integration_tests/llui_libtest/llui_libtest.cpp

indra/linux_updater/linux_updater.cpp

indra/llvfs/CMakeLists.txt

indra/llvfs/lldir.cpp

indra/llvfs/lldir.h

indra/llvfs/lldir_linux.cpp

indra/llvfs/lldir_linux.h

indra/llvfs/lldir_mac.cpp

indra/llvfs/lldir_mac.h

indra/llvfs/lldir_solaris.cpp

indra/llvfs/lldir_solaris.h

indra/llvfs/lldir_win32.cpp

indra/llvfs/lldir_win32.h

indra/llvfs/tests/lldir_test.cpp

indra/newview/llappviewer.cpp

indra/newview/llappviewerlinux.cpp

indra/newview/llfloateruipreview.cpp

indra/newview/lllogchat.cpp

indra/newview/llviewermedia.cpp

indra/newview/llwaterparammanager.cpp