aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-27 12:22:02 -0700
committerMcCabe Maxsted2009-09-27 12:22:02 -0700
commit5266e1bba9142f11c8357cf164cfa9b6fa482fef (patch)
tree5aece9381ae6808a71419a2eabb0d4aba9c10d59 /linden/indra
parentMade the windlight floater toggle (diff)
downloadmeta-impy-5266e1bba9142f11c8357cf164cfa9b6fa482fef.zip
meta-impy-5266e1bba9142f11c8357cf164cfa9b6fa482fef.tar.gz
meta-impy-5266e1bba9142f11c8357cf164cfa9b6fa482fef.tar.bz2
meta-impy-5266e1bba9142f11c8357cf164cfa9b6fa482fef.tar.xz
Changes to make the grid manager compile on Windows
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/hippoGridManager.cpp2
-rw-r--r--linden/indra/newview/hippoLimits.cpp2
-rw-r--r--linden/indra/newview/hippoRestRequest.cpp2
-rw-r--r--linden/indra/newview/llappviewer.h9
-rw-r--r--linden/indra/newview/llappviewerwin32.cpp4
5 files changed, 17 insertions, 2 deletions
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 @@
1 1
2 2
3#include "llviewerprecompiledheaders.h"
4
3#include "hippoGridManager.h" 5#include "hippoGridManager.h"
4 6
5#include <cctype> 7#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 @@
1 1
2 2
3#include "llviewerprecompiledheaders.h"
4
3#include "hippoLimits.h" 5#include "hippoLimits.h"
4 6
5#include "hippoGridManager.h" 7#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 @@
1 1
2 2
3#include "llviewerprecompiledheaders.h"
4
3#include "hippoRestRequest.h" 5#include "hippoRestRequest.h"
4 6
5#ifndef CURL_STATICLIB 7#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:
224 // for tracking viewer<->region circuit death 224 // for tracking viewer<->region circuit death
225 bool mAgentRegionLastAlive; 225 bool mAgentRegionLastAlive;
226 LLUUID mAgentRegionLastID; 226 LLUUID mAgentRegionLastID;
227
228//public:
229// //some information for updater
230// typedef struct
231// {
232// std::string mUpdateExePath;
233// std::ostringstream mParams;
234// }LLUpdaterInfo ;
235// static LLUpdaterInfo *sUpdaterInfo ;
227}; 236};
228 237
229// consts from viewer.h 238// 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,
227 viewer_app_ptr = NULL; 227 viewer_app_ptr = NULL;
228 228
229 //start updater 229 //start updater
230 if(LLAppViewer::sUpdaterInfo) 230 /*if(LLAppViewer::sUpdaterInfo)
231 { 231 {
232 _spawnl(_P_NOWAIT, LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mParams.str().c_str(), NULL); 232 _spawnl(_P_NOWAIT, LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mParams.str().c_str(), NULL);
233 233
234 delete LLAppViewer::sUpdaterInfo ; 234 delete LLAppViewer::sUpdaterInfo ;
235 LLAppViewer::sUpdaterInfo = NULL ; 235 LLAppViewer::sUpdaterInfo = NULL ;
236 } 236 }*/
237 237
238 return 0; 238 return 0;
239} 239}