Fixed several compile errors with VS2005
This commit is contained in:
Hazim Gazov
@@ -95,10 +95,10 @@
|
||||
#include "lltexturefetch.h"
|
||||
#include "llimageworker.h"
|
||||
|
||||
// <edit>
|
||||
#include "lldelayeduidelete.h"
|
||||
#include "llbuildnewviewsscheduler.h"
|
||||
// </edit>
|
||||
// <edit>
|
||||
#include "lldelayeduidelete.h"
|
||||
#include "llbuildnewviewsscheduler.h"
|
||||
// </edit>
|
||||
// The files below handle dependencies from cleanup.
|
||||
#include "llkeyframemotion.h"
|
||||
#include "llworldmap.h"
|
||||
@@ -245,9 +245,9 @@ F32 gLogoutMaxTime = LOGOUT_REQUEST_TIME;
|
||||
|
||||
LLUUID gInventoryLibraryOwner;
|
||||
LLUUID gInventoryLibraryRoot;
|
||||
// <edit>
|
||||
LLUUID gLocalInventoryRoot;
|
||||
// </edit>
|
||||
// <edit>
|
||||
LLUUID gLocalInventoryRoot;
|
||||
// </edit>
|
||||
|
||||
BOOL gDisconnected = FALSE;
|
||||
|
||||
@@ -291,9 +291,9 @@ const std::string ERROR_MARKER_FILE_NAME("SecondLife.error_marker");
|
||||
const std::string LLERROR_MARKER_FILE_NAME("SecondLife.llerror_marker");
|
||||
const std::string LOGOUT_MARKER_FILE_NAME("SecondLife.logout_marker");
|
||||
static BOOL gDoDisconnect = FALSE;
|
||||
// <edit>
|
||||
//static BOOL gBusyDisconnect = FALSE;
|
||||
// </edit>
|
||||
// <edit>
|
||||
//static BOOL gBusyDisconnect = FALSE;
|
||||
// </edit>
|
||||
static std::string gLaunchFileOnQuit;
|
||||
|
||||
// Used on Win32 for other apps to identify our window (eg, win_setup)
|
||||
@@ -575,10 +575,10 @@ bool LLAppViewer::init()
|
||||
|
||||
initLogging();
|
||||
|
||||
// <edit>
|
||||
gDeleteScheduler = new LLDeleteScheduler();
|
||||
gBuildNewViewsScheduler = new LLBuildNewViewsScheduler();
|
||||
// </edit>
|
||||
// <edit>
|
||||
gDeleteScheduler = new LLDeleteScheduler();
|
||||
gBuildNewViewsScheduler = new LLBuildNewViewsScheduler();
|
||||
// </edit>
|
||||
//
|
||||
// OK to write stuff to logs now, we've now crash reported if necessary
|
||||
//
|
||||
@@ -594,19 +594,19 @@ bool LLAppViewer::init()
|
||||
writeSystemInfo();
|
||||
|
||||
// Build a string representing the current version number.
|
||||
// <edit> meh
|
||||
/*
|
||||
// </edit>
|
||||
// <edit> meh
|
||||
/*
|
||||
// </edit>
|
||||
gCurrentVersion = llformat("%s %d.%d.%d.%d",
|
||||
gSavedSettings.getString("VersionChannelName").c_str(),
|
||||
LL_VERSION_MAJOR,
|
||||
LL_VERSION_MINOR,
|
||||
LL_VERSION_PATCH,
|
||||
LL_VERSION_BUILD );
|
||||
// <edit>
|
||||
*/
|
||||
gCurrentVersion = gSavedSettings.getString("SpecifiedChannel");
|
||||
// </edit>
|
||||
// <edit>
|
||||
*/
|
||||
gCurrentVersion = gSavedSettings.getString("SpecifiedChannel");
|
||||
// </edit>
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
@@ -940,7 +940,7 @@ bool LLAppViewer::mainLoop()
|
||||
pauseMainloopTimeout(); // *TODO: Remove. Messages shouldn't be stalling for 20+ seconds!
|
||||
|
||||
LLFastTimer t3(LLFastTimer::FTM_IDLE);
|
||||
// <edit> bad_alloc!! </edit>
|
||||
// <edit> bad_alloc!! </edit>
|
||||
idle();
|
||||
|
||||
if (gAres != NULL && gAres->isInitialized())
|
||||
@@ -1223,11 +1223,11 @@ bool LLAppViewer::cleanup()
|
||||
// such that we can suck rectangle information out of
|
||||
// it.
|
||||
cleanupSavedSettings();
|
||||
llinfos << "Settings patched up" << llendflush;
|
||||
|
||||
// <edit> moving this to below.
|
||||
/*
|
||||
// </edit>
|
||||
llinfos << "Settings patched up" << llendflush;
|
||||
|
||||
// <edit> moving this to below.
|
||||
/*
|
||||
// </edit>
|
||||
// delete some of the files left around in the cache.
|
||||
removeCacheFiles("*.wav");
|
||||
removeCacheFiles("*.tmp");
|
||||
@@ -1236,9 +1236,9 @@ bool LLAppViewer::cleanup()
|
||||
removeCacheFiles("*.dsf");
|
||||
removeCacheFiles("*.bodypart");
|
||||
removeCacheFiles("*.clothing");
|
||||
// <edit>
|
||||
*/
|
||||
// </edit>
|
||||
// <edit>
|
||||
*/
|
||||
// </edit>
|
||||
|
||||
llinfos << "Cache files removed" << llendflush;
|
||||
|
||||
@@ -1367,18 +1367,18 @@ bool LLAppViewer::cleanup()
|
||||
}
|
||||
|
||||
removeMarkerFile(); // Any crashes from here on we'll just have to ignore
|
||||
// <edit> moved this stuff from above to make it conditional here...
|
||||
if(!anotherInstanceRunning())
|
||||
{
|
||||
removeCacheFiles("*.wav");
|
||||
removeCacheFiles("*.tmp");
|
||||
removeCacheFiles("*.lso");
|
||||
removeCacheFiles("*.out");
|
||||
removeCacheFiles("*.dsf");
|
||||
removeCacheFiles("*.bodypart");
|
||||
removeCacheFiles("*.clothing");
|
||||
}
|
||||
// </edit>
|
||||
// <edit> moved this stuff from above to make it conditional here...
|
||||
if(!anotherInstanceRunning())
|
||||
{
|
||||
removeCacheFiles("*.wav");
|
||||
removeCacheFiles("*.tmp");
|
||||
removeCacheFiles("*.lso");
|
||||
removeCacheFiles("*.out");
|
||||
removeCacheFiles("*.dsf");
|
||||
removeCacheFiles("*.bodypart");
|
||||
removeCacheFiles("*.clothing");
|
||||
}
|
||||
// </edit>
|
||||
|
||||
writeDebugInfo();
|
||||
|
||||
@@ -2188,9 +2188,9 @@ bool LLAppViewer::initWindow()
|
||||
|
||||
// always start windowed
|
||||
BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth");
|
||||
// <edit>
|
||||
//gViewerWindow = new LLViewerWindow(gWindowTitle, "Second Life",
|
||||
gViewerWindow = new LLViewerWindow("Inertia", "Second Life",
|
||||
// <edit>
|
||||
//gViewerWindow = new LLViewerWindow(gWindowTitle, "Second Life",
|
||||
gViewerWindow = new LLViewerWindow("Inertia", "Second Life",
|
||||
// </edit>
|
||||
gSavedSettings.getS32("WindowX"), gSavedSettings.getS32("WindowY"),
|
||||
gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight"),
|
||||
@@ -2320,10 +2320,10 @@ void LLAppViewer::writeSystemInfo()
|
||||
{
|
||||
gDebugInfo["SLLog"] = LLError::logFileName();
|
||||
|
||||
// <edit>
|
||||
//gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
|
||||
gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("SpecifiedChannel");
|
||||
// </edit>
|
||||
// <edit>
|
||||
//gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
|
||||
gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("SpecifiedChannel");
|
||||
// </edit>
|
||||
gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
|
||||
gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
|
||||
gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
|
||||
@@ -2419,10 +2419,10 @@ void LLAppViewer::handleViewerCrash()
|
||||
|
||||
//We already do this in writeSystemInfo(), but we do it again here to make /sure/ we have a version
|
||||
//to check against no matter what
|
||||
// <edit>
|
||||
//gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
|
||||
gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("SpecifiedChannel");
|
||||
// </edit>
|
||||
// <edit>
|
||||
//gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
|
||||
gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("SpecifiedChannel");
|
||||
// </edit>
|
||||
|
||||
gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
|
||||
gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
|
||||
@@ -3123,9 +3123,9 @@ void LLAppViewer::badNetworkHandler()
|
||||
|
||||
// Flush all of our caches on exit in the case of disconnect due to
|
||||
// invalid packets.
|
||||
// <edit>
|
||||
if(1) return;
|
||||
// </edit>
|
||||
// <edit>
|
||||
if(1) return;
|
||||
// </edit>
|
||||
|
||||
mPurgeOnExit = TRUE;
|
||||
|
||||
@@ -3342,10 +3342,10 @@ void LLAppViewer::idle()
|
||||
// *FIX: (???) SAMANTHA
|
||||
if (viewer_stats_timer.getElapsedTimeF32() >= SEND_STATS_PERIOD && !gDisconnected)
|
||||
{
|
||||
// <edit> we are not transmitting session stats
|
||||
//llinfos << "Transmitting sessions stats" << llendl;
|
||||
//send_stats();
|
||||
// </edit>
|
||||
// <edit> we are not transmitting session stats
|
||||
//llinfos << "Transmitting sessions stats" << llendl;
|
||||
//send_stats();
|
||||
// </edit>
|
||||
viewer_stats_timer.reset();
|
||||
}
|
||||
|
||||
@@ -4083,10 +4083,10 @@ void LLAppViewer::handleLoginComplete()
|
||||
initMainloopTimeout("Mainloop Init");
|
||||
|
||||
// Store some data to DebugInfo in case of a freeze.
|
||||
// <edit>
|
||||
//gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
|
||||
gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("SpecifiedChannel");
|
||||
// </edit>
|
||||
// <edit>
|
||||
//gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
|
||||
gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("SpecifiedChannel");
|
||||
// </edit>
|
||||
|
||||
gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
|
||||
gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
|
||||
|
||||
Reference in New Issue
Block a user