From 5266e1bba9142f11c8357cf164cfa9b6fa482fef Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 27 Sep 2009 12:22:02 -0700
Subject: Changes to make the grid manager compile on Windows

---
 linden/indra/newview/hippoGridManager.cpp | 2 ++
 linden/indra/newview/hippoLimits.cpp      | 2 ++
 linden/indra/newview/hippoRestRequest.cpp | 2 ++
 linden/indra/newview/llappviewer.h        | 9 +++++++++
 linden/indra/newview/llappviewerwin32.cpp | 4 ++--
 5 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/hippoGridManager.cpp b/linden/indra/newview/hippoGridManager.cpp
index 485be20..7a2a3e9 100644
--- a/linden/indra/newview/hippoGridManager.cpp
+++ b/linden/indra/newview/hippoGridManager.cpp
@@ -1,5 +1,7 @@
 
 
+#include "llviewerprecompiledheaders.h"
+
 #include "hippoGridManager.h"
 
 #include <cctype>
diff --git a/linden/indra/newview/hippoLimits.cpp b/linden/indra/newview/hippoLimits.cpp
index d5deb9f..dae81a6 100644
--- a/linden/indra/newview/hippoLimits.cpp
+++ b/linden/indra/newview/hippoLimits.cpp
@@ -1,5 +1,7 @@
 
 
+#include "llviewerprecompiledheaders.h"
+
 #include "hippoLimits.h"
 
 #include "hippoGridManager.h"
diff --git a/linden/indra/newview/hippoRestRequest.cpp b/linden/indra/newview/hippoRestRequest.cpp
index cf518de..20e6187 100644
--- a/linden/indra/newview/hippoRestRequest.cpp
+++ b/linden/indra/newview/hippoRestRequest.cpp
@@ -1,5 +1,7 @@
 
 
+#include "llviewerprecompiledheaders.h"
+
 #include "hippoRestRequest.h"
 
 #ifndef CURL_STATICLIB
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index 8d8e30f..66784f3 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -224,6 +224,15 @@ private:
 	// for tracking viewer<->region circuit death
 	bool mAgentRegionLastAlive;
 	LLUUID mAgentRegionLastID;
+
+//public:
+//	//some information for updater
+//	typedef struct
+//	{
+//		std::string mUpdateExePath;
+//		std::ostringstream mParams;
+//	}LLUpdaterInfo ;
+//	static LLUpdaterInfo *sUpdaterInfo ;
 };
 
 // consts from viewer.h
diff --git a/linden/indra/newview/llappviewerwin32.cpp b/linden/indra/newview/llappviewerwin32.cpp
index b68cad6..110364d 100644
--- a/linden/indra/newview/llappviewerwin32.cpp
+++ b/linden/indra/newview/llappviewerwin32.cpp
@@ -227,13 +227,13 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
 	viewer_app_ptr = NULL;
 
 	//start updater
-	if(LLAppViewer::sUpdaterInfo)
+	/*if(LLAppViewer::sUpdaterInfo)
 	{
 		_spawnl(_P_NOWAIT, LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mParams.str().c_str(), NULL);
 
 		delete LLAppViewer::sUpdaterInfo ;
 		LLAppViewer::sUpdaterInfo = NULL ;
-	}
+	}*/
 
 	return 0;
 }
-- 
cgit v1.1