Some minor additional changes (filepicker)

indra/newview/statemachine/aifilepicker.cpp

@@ -103,7 +103,6 @@ std::string AIFilePicker::get_folder(std::string const& default_path, std::strin
 		char const* home = NULL;
 #if LL_WINDOWS
 		home = getenv("HOMEPATH");
-		//#warning "Attention WINDOWS DEVELOPER: Set 'home' to a sensible default directory (users Desktop?)"
 #else
 		home = getenv("HOME");
 #endif

indra/plugins/filepicker/legacy.h

@@ -30,6 +30,13 @@
 
 #include <map>
 #include <string>
+
+#ifdef LL_WINDOWS
+#include <windows.h>
+#include <WinUser.h>
+#include <commdlg.h>
+#endif
+
 #include "stdtypes.h"				// BOOL
 
 // Translation map.
@@ -62,13 +69,6 @@ namespace LLWindowSDL {
 #include "llstring.h"
 #endif
 
-// Need commdlg.h for OPENFILENAMEA
-#ifdef LL_WINDOWS
-#include <windows.h>
-#include <WinUser.h>
-#include <commdlg.h>
-#endif
-
 // mostly for Linux, possible on others
 #if LL_GTK
 # include "gtk/gtk.h"

indra/plugins/filepicker/lldirpicker.cpp

@@ -32,14 +32,9 @@
 
 #include "linden_common.h"
 #include "lldirpicker.h"
-#include "llpreprocessor.h"
 #include "llerror.h"
 #include "basic_plugin_base.h"      // For PLS_INFOS etc.
 
-#if LL_LINUX || LL_SOLARIS
-# include "llfilepicker.h"
-#endif
-
 //
 // Globals
 //

indra/plugins/filepicker/llfilepicker.cpp

@@ -32,7 +32,6 @@
 
 #include "linden_common.h"
 #include "llfilepicker.h"
-#include "llpreprocessor.h"
 #include "llerror.h"
 #include "basic_plugin_base.h"		// For PLS_INFOS etc.