Merge remote-tracking branch 'mccabe/exp' into weekly

Conflicts:  (Keeping these around as a record, there was some strangeness.
	.gitignore
	linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
	linden/indra/newview/llfloaterregioninfo.cpp
	linden/indra/newview/llfloatertos.cpp
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/skins/default/html/en-us/loading-error/index.html
	linden/indra/newview/skins/default/html/en-us/loading/loading.html
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/install.xml

1 files changed, 1 insertions, 1 deletions

diff --git a/linden/indra/llvfs/lldir_win32.cpp b/linden/indra/llvfs/lldir_win32.cpp
index 9d4c5ec..e5d6747 100644
--- a/linden/indra/llvfs/lldir_win32.cpp
+++ b/linden/indra/llvfs/lldir_win32.cpp
@@ -112,7 +112,7 @@ LLDir_Win32::LLDir_Win32()
         }
         else
         {
-                fprintf(stderr, "Couldn't get APP path, assuming current directory!");
+                LL_WARNS("AppInit") << "Couldn't get APP path, assuming current directory!\n" << LL_ENDL;
                 GetCurrentDirectory(MAX_PATH, w_str);
                 mExecutableDir = utf16str_to_utf8str(llutf16string(w_str));
                 // Assume it's the current directory