From 00f8c35614bc994512bebd5dc37b661c1b590d0b Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Mon, 16 May 2011 01:26:43 +0200
Subject: [PATCH] Some minor additional changes (filepicker)

---
 indra/newview/statemachine/aifilepicker.cpp |  1 -
 indra/plugins/filepicker/legacy.h           | 14 +++++++-------
 indra/plugins/filepicker/lldirpicker.cpp    |  5 -----
 indra/plugins/filepicker/llfilepicker.cpp   |  1 -
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/indra/newview/statemachine/aifilepicker.cpp b/indra/newview/statemachine/aifilepicker.cpp
index 07621fdec..5e7a64da9 100644
--- a/indra/newview/statemachine/aifilepicker.cpp
+++ b/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
diff --git a/indra/plugins/filepicker/legacy.h b/indra/plugins/filepicker/legacy.h
index 64bdf6aa9..4cd22eaeb 100644
--- a/indra/plugins/filepicker/legacy.h
+++ b/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"
diff --git a/indra/plugins/filepicker/lldirpicker.cpp b/indra/plugins/filepicker/lldirpicker.cpp
index 9331359cb..ae5873209 100644
--- a/indra/plugins/filepicker/lldirpicker.cpp
+++ b/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
 //
diff --git a/indra/plugins/filepicker/llfilepicker.cpp b/indra/plugins/filepicker/llfilepicker.cpp
index 4eaa2f3d7..ffad899d6 100644
--- a/indra/plugins/filepicker/llfilepicker.cpp
+++ b/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.