[sldev-commits] r159 - in branches/Branch_1-18-6-Viewer: indra/llaudio indra/llcharacter indra/llcommon indra/llcrashlogger indra/llimage indra/llimagej2coj indra/llinventory indra/llmath indra/llmedia indra/llmessage indra/llprimitive indra/llrender indra/llui indra/llvfs indra/llwindow indra/llxml indra/lscript/lscript_compile indra/lscript/lscript_execute indra/lscript/lscript_library indra/newview indra/newview/CrashReporter.nib indra/win_crash_logger libraries/include

soft.linden at svn.secondlife.com soft.linden at svn.secondlife.com
Sun Dec 9 18:14:08 PST 2007


Author: soft.linden
Date: 2007-12-09 20:14:07 -0600 (Sun, 09 Dec 2007)
New Revision: 159

Modified:
   branches/Branch_1-18-6-Viewer/indra/llaudio/llaudio.vcproj
   branches/Branch_1-18-6-Viewer/indra/llaudio/llaudio_vc8.vcproj
   branches/Branch_1-18-6-Viewer/indra/llcharacter/llcharacter.vcproj
   branches/Branch_1-18-6-Viewer/indra/llcharacter/llcharacter_vc8.vcproj
   branches/Branch_1-18-6-Viewer/indra/llcommon/indra_constants.h
   branches/Branch_1-18-6-Viewer/indra/llcommon/llcommon.vcproj
   branches/Branch_1-18-6-Viewer/indra/llcommon/llcommon_vc8.vcproj
   branches/Branch_1-18-6-Viewer/indra/llcrashlogger/llcrashlogger.cpp
   branches/Branch_1-18-6-Viewer/indra/llcrashlogger/llcrashlogger.h
   branches/Branch_1-18-6-Viewer/indra/llimage/llimage.vcproj
   branches/Branch_1-18-6-Viewer/indra/llimage/llimage_vc8.vcproj
   branches/Branch_1-18-6-Viewer/indra/llimagej2coj/llimagej2coj.vcproj
   branches/Branch_1-18-6-Viewer/indra/llinventory/llinventory.vcproj
   branches/Branch_1-18-6-Viewer/indra/llinventory/llinventory_vc8.vcproj
   branches/Branch_1-18-6-Viewer/indra/llmath/llmath.vcproj
   branches/Branch_1-18-6-Viewer/indra/llmath/llmath_vc8.vcproj
   branches/Branch_1-18-6-Viewer/indra/llmedia/llmedia.vcproj
   branches/Branch_1-18-6-Viewer/indra/llmedia/llmedia_vc8.vcproj
   branches/Branch_1-18-6-Viewer/indra/llmessage/llmessage.vcproj
   branches/Branch_1-18-6-Viewer/indra/llmessage/llmessage_vc8.vcproj
   branches/Branch_1-18-6-Viewer/indra/llprimitive/llprimitive.vcproj
   branches/Branch_1-18-6-Viewer/indra/llprimitive/llprimitive_vc8.vcproj
   branches/Branch_1-18-6-Viewer/indra/llrender/llrender.vcproj
   branches/Branch_1-18-6-Viewer/indra/llrender/llrender_vc8.vcproj
   branches/Branch_1-18-6-Viewer/indra/llui/llui.vcproj
   branches/Branch_1-18-6-Viewer/indra/llui/llui_vc8.vcproj
   branches/Branch_1-18-6-Viewer/indra/llvfs/llvfs.vcproj
   branches/Branch_1-18-6-Viewer/indra/llvfs/llvfs_vc8.vcproj
   branches/Branch_1-18-6-Viewer/indra/llwindow/llwindow.vcproj
   branches/Branch_1-18-6-Viewer/indra/llwindow/llwindow_vc8.vcproj
   branches/Branch_1-18-6-Viewer/indra/llxml/llxml.vcproj
   branches/Branch_1-18-6-Viewer/indra/llxml/llxml_vc8.vcproj
   branches/Branch_1-18-6-Viewer/indra/lscript/lscript_compile/lscript_compile.vcproj
   branches/Branch_1-18-6-Viewer/indra/lscript/lscript_compile/lscript_compile_vc8.vcproj
   branches/Branch_1-18-6-Viewer/indra/lscript/lscript_execute/lscript_execute.vcproj
   branches/Branch_1-18-6-Viewer/indra/lscript/lscript_execute/lscript_execute_vc8.vcproj
   branches/Branch_1-18-6-Viewer/indra/lscript/lscript_library/lscript_library.vcproj
   branches/Branch_1-18-6-Viewer/indra/lscript/lscript_library/lscript_library_vc8.vcproj
   branches/Branch_1-18-6-Viewer/indra/newview/CrashReporter.nib/classes.nib
   branches/Branch_1-18-6-Viewer/indra/newview/CrashReporter.nib/info.nib
   branches/Branch_1-18-6-Viewer/indra/newview/CrashReporter.nib/objects.xib
   branches/Branch_1-18-6-Viewer/indra/newview/llpanellogin.cpp
   branches/Branch_1-18-6-Viewer/indra/newview/llpanellogin.h
   branches/Branch_1-18-6-Viewer/indra/newview/llselectmgr.cpp
   branches/Branch_1-18-6-Viewer/indra/newview/llviewermenu.cpp
   branches/Branch_1-18-6-Viewer/indra/newview/llwebbrowserctrl.cpp
   branches/Branch_1-18-6-Viewer/indra/newview/llwebbrowserctrl.h
   branches/Branch_1-18-6-Viewer/indra/newview/newview.vcproj
   branches/Branch_1-18-6-Viewer/indra/newview/newview_vc8.vcproj
   branches/Branch_1-18-6-Viewer/indra/win_crash_logger/llcrashloggerwindows.cpp
   branches/Branch_1-18-6-Viewer/libraries/include/llmozlib.h
Trac: http://svn.secondlife.com/trac/linden/changeset/159
Log:
Match 1.18.6RC0 source to library/artwork version

Modified: branches/Branch_1-18-6-Viewer/indra/llaudio/llaudio.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llaudio/llaudio.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llaudio/llaudio.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -64,7 +64,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -107,7 +106,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llaudio/llaudio_vc8.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llaudio/llaudio_vc8.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llaudio/llaudio_vc8.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -109,7 +109,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -176,7 +175,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llcharacter/llcharacter.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llcharacter/llcharacter.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llcharacter/llcharacter.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -63,7 +63,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -106,7 +105,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llcharacter/llcharacter_vc8.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llcharacter/llcharacter_vc8.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llcharacter/llcharacter_vc8.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -4,7 +4,6 @@
 	Version="8.00"
 	Name="llcharacter"
 	ProjectGUID="{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}"
-	RootNamespace="llcharacter"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -109,7 +108,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -176,7 +174,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llcommon/indra_constants.h
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llcommon/indra_constants.h	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llcommon/indra_constants.h	2007-12-10 02:14:07 UTC (rev 159)
@@ -336,7 +336,7 @@
 
 // Crash reporter behavior
 const char* const CRASH_SETTINGS_FILE = "crash_settings.xml";
-const char* const CRASH_BEHAVIOR_SETTING = "CrashLogBehavior";
+const char* const CRASH_BEHAVIOR_SETTING = "CrashBehavior";
 const S32 CRASH_BEHAVIOR_ASK = 0;
 const S32 CRASH_BEHAVIOR_ALWAYS_SEND = 1;
 const S32 CRASH_BEHAVIOR_NEVER_SEND = 2;

Modified: branches/Branch_1-18-6-Viewer/indra/llcommon/llcommon.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llcommon/llcommon.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llcommon/llcommon.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -64,7 +64,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				GlobalOptimizations="TRUE"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="TRUE"
@@ -112,7 +111,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;XML_STATIC;APR_DECLARE_STATIC"

Modified: branches/Branch_1-18-6-Viewer/indra/llcommon/llcommon_vc8.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llcommon/llcommon_vc8.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llcommon/llcommon_vc8.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -109,7 +109,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\"
@@ -178,7 +177,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XML_STATIC;APR_DECLARE_STATIC"

Modified: branches/Branch_1-18-6-Viewer/indra/llcrashlogger/llcrashlogger.cpp
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llcrashlogger/llcrashlogger.cpp	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llcrashlogger/llcrashlogger.cpp	2007-12-10 02:14:07 UTC (rev 159)
@@ -1,7 +1,7 @@
-/** 
-* @file llcrashlogger.cpp
-* @brief Crash logger implementation
-*
+/** 
+* @file llcrashlogger.cpp
+* @brief Crash logger implementation
+*
 * $LicenseInfo:firstyear=2003&license=viewergpl$
 * 
 * Copyright (c) 2003-2007, Linden Research, Inc.
@@ -27,283 +27,283 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
-*/
-#include <cstdio>
-#include <cstdlib>
-#include <sstream>
-#include <map>
-
-#include "llcrashlogger.h"
-#include "linden_common.h"
-#include "llstring.h"
-#include "indra_constants.h"	// CRASH_BEHAVIOR_ASK, CRASH_SETTING_NAME
-#include "llerror.h"
-#include "lltimer.h"
-#include "lldir.h"
-#include "llsdserialize.h"
-#include "lliopipe.h"
-#include "llpumpio.h"
-#include "llhttpclient.h"
-#include "llsdserialize.h"
-
-LLPumpIO* gServicePump;
-BOOL gBreak = false;
-BOOL gSent = false;
-
-class LLCrashLoggerResponder : public LLHTTPClient::Responder
-{
-public:
-	LLCrashLoggerResponder() 
-	{
-	}
-
-	virtual void error(U32 status, const std::string& reason)
-	{
-		gBreak = true;		
-	}
-
-	virtual void result(const LLSD& content)
-	{	
-		gBreak = true;
-		gSent = true;
-	}
-};
-
-bool LLCrashLoggerText::mainLoop()
-{
-	std::cout << "Entering main loop" << std::endl;
-	sendCrashLogs();
-	return true;	
-}
-
-void LLCrashLoggerText::updateApplication(LLString message)
-{
-	LLCrashLogger::updateApplication(message);
-	std::cout << message << std::endl;
-}
-
-LLCrashLogger::LLCrashLogger() :
-mSentCrashLogs(false)
-{
-
-}
-
-LLCrashLogger::~LLCrashLogger()
-{
-
-}
-
-void LLCrashLogger::gatherFiles()
-{
-
-	/*
-	//TODO:This function needs to be reimplemented somewhere in here...
-	if(!previous_crash && is_crash_log)
-	{
-		// Make sure the file isn't too old.
-		double age = difftime(gLaunchTime, stat_data.st_mtimespec.tv_sec);
-		
-		//			llinfos << "age is " << age << llendl;
-		
-		if(age > 60.0)
-		{
-				// The file was last modified more than 60 seconds before the crash reporter was launched.  Assume it's stale.
-			llwarns << "File " << mFilename << " is too old!" << llendl;
-			return;
-		}
-	}
-	*/
-
-	updateApplication("Gathering logs...");
-
-	// Figure out the filename of the debug log
-	LLString db_file_name = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"debug_info.log").c_str();
-	std::ifstream debug_log_file(db_file_name.c_str());
-
-	// Look for it in the debug_info.log file
-	if (debug_log_file.is_open())
-	{		
-		LLSDSerialize::fromXML(mDebugLog, debug_log_file);
-		mFileMap["SecondLifeLog"] = mDebugLog["SLLog"].asString();
-		mFileMap["SettingsXml"] = mDebugLog["SettingsFilename"].asString();
-		LLHTTPClient::setCABundle(mDebugLog["CAFilename"].asString());
-		llinfos << "Using log file from debug log " << mFileMap["SecondLifeLog"] << llendl;
-		llinfos << "Using settings file from debug log " << mFileMap["SettingsXml"] << llendl;
-	}
-	else
-	{
-		// Figure out the filename of the second life log
-		LLHTTPClient::setCABundle(gDirUtilp->getCAFile());
-		mFileMap["SecondLifeLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.log");
-		mFileMap["SettingsXml"] = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,"settings.xml");
-	}
-
-	gatherPlatformSpecificFiles();
-
-	//Use the debug log to reconstruct the URL to send the crash report to
-	mCrashHost = "https://";
-	mCrashHost += mDebugLog["CurrentSimHost"].asString();
-	mCrashHost += ":12043/crash/report";
-	mAltCrashHost = "https://";
-	mAltCrashHost += mDebugLog["GridUtilHost"].asString();
-	mAltCrashHost += ":12043/crash/report";
-
-	mCrashInfo["DebugLog"] = mDebugLog;
-	mFileMap["StatsLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stats.log");
-	mFileMap["StackTrace"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stack_trace.log");
-	
-	updateApplication("Encoding files...");
-
-	for(std::map<LLString, LLString>::iterator itr = mFileMap.begin(); itr != mFileMap.end(); ++itr)
-	{
-		std::ifstream f((*itr).second.c_str());
-		if(!f.is_open())
-		{
-			std::cout << "Can't find file " << (*itr).second.c_str() << std::endl;
-			continue;
-		}
-		std::stringstream s;
-		s << f.rdbuf();
-		mCrashInfo[(*itr).first] = s.str();
-	}
-}
-
-LLSD LLCrashLogger::constructPostData()
-{
-	LLSD ret;
-
-	if(mCrashInPreviousExec)
-	{
-		mCrashInfo["CrashInPreviousExecution"] = "Y";
-	}
-
-	return mCrashInfo;
-}
-
-S32 LLCrashLogger::loadCrashBehaviorSetting()
-{
-	std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
-
-	mCrashSettings.loadFromFile(filename);
-		
-	S32 value = mCrashSettings.getS32(CRASH_BEHAVIOR_SETTING);
-	
-	if (value < CRASH_BEHAVIOR_ASK || CRASH_BEHAVIOR_NEVER_SEND < value) return CRASH_BEHAVIOR_ASK;
-
-	return value;
-}
-
-bool LLCrashLogger::saveCrashBehaviorSetting(S32 crash_behavior)
-{
-	if (crash_behavior < CRASH_BEHAVIOR_ASK) return false;
-	if (crash_behavior > CRASH_BEHAVIOR_NEVER_SEND) return false;
-
-	mCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, crash_behavior);
-	std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
-
-	mCrashSettings.saveToFile(filename, FALSE);
-
-	return true;
-}
-
-bool LLCrashLogger::sendCrashLogs()
-{
-	gatherFiles();
-
-	LLSD post_data;
-	post_data = constructPostData();
-
-	updateApplication("Sending reports...");
-
-	std::string dump_path = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
-															   "SecondLifeCrashReport");
-	std::string report_file = dump_path + ".log";
-
-	std::ofstream out_file(report_file.c_str());
-	LLSDSerialize::toPrettyXML(post_data, out_file);
-	out_file.close();
-	LLHTTPClient::post(mCrashHost, post_data, new LLCrashLoggerResponder(), 5);
-
-	gBreak = false;
-	while(!gBreak)
-	{
-		updateApplication("Sending logs...");
-	}
-
-	if(!gSent)
-	{
-		gBreak = false;
-		LLHTTPClient::post(mAltCrashHost, post_data, new LLCrashLoggerResponder(), 5);
-
-		while(!gBreak)
-		{
-			updateApplication("Sending logs to Alternate Server...");
-		}
-	}
-	mSentCrashLogs = gSent;
-
-	return true;
-}
-
-void LLCrashLogger::updateApplication(LLString message)
-{
-	gServicePump->pump();
-    gServicePump->callback();
-}
-
-bool LLCrashLogger::init()
-{
-	// We assume that all the logs we're looking for reside on the current drive
-	gDirUtilp->initAppDirs("SecondLife");
-
-	// Default to the product name "Second Life" (this is overridden by the -name argument)
-	mProductName = "Second Life";
-	
-	mCrashSettings.declareS32(CRASH_BEHAVIOR_SETTING, CRASH_BEHAVIOR_ASK, "Controls behavior when viewer crashes "
-		"(0 = ask before sending crash report, 1 = always send crash report, 2 = never send crash report)");
-
-	llinfos << "Loading crash behavior setting" << llendl;
-	mCrashBehavior = loadCrashBehaviorSetting();
-
-	//Run through command line options
-	if(getOption("previous").isDefined())
-	{
-		llinfos << "Previous execution did not remove SecondLife.exec_marker" << llendl;
-		mCrashInPreviousExec = TRUE;
-	}
-
-	if(getOption("dialog").isDefined())
-	{
-		llinfos << "Show the user dialog" << llendl;
-		mCrashBehavior = CRASH_BEHAVIOR_ASK;
-	}
-
-	LLSD server = getOption("user");
-	if(server.isDefined())
-	{
-		mGridName = server.asString();
-		llinfos << "Got userserver " << mGridName << llendl;
-	}
-	else
-	{
-		mGridName = "agni";
-	}
-
-	LLSD name = getOption("name");
-	if(name.isDefined())
-	{	
-		mProductName = name.asString();
-	}
-
-	// If user doesn't want to send, bail out
-	if (mCrashBehavior == CRASH_BEHAVIOR_NEVER_SEND)
-	{
-		llinfos << "Crash behavior is never_send, quitting" << llendl;
-		return false;
-	}
-
-	gServicePump = new LLPumpIO(gAPRPoolp);
-	gServicePump->prime(gAPRPoolp);
-	LLHTTPClient::setPump(*gServicePump);
-	return true;
-}
+*/
+#include <cstdio>
+#include <cstdlib>
+#include <sstream>
+#include <map>
+
+#include "llcrashlogger.h"
+#include "linden_common.h"
+#include "llstring.h"
+#include "indra_constants.h"	// CRASH_BEHAVIOR_ASK, CRASH_SETTING_NAME
+#include "llerror.h"
+#include "lltimer.h"
+#include "lldir.h"
+#include "llsdserialize.h"
+#include "lliopipe.h"
+#include "llpumpio.h"
+#include "llhttpclient.h"
+#include "llsdserialize.h"
+
+LLPumpIO* gServicePump;
+BOOL gBreak = false;
+BOOL gSent = false;
+
+class LLCrashLoggerResponder : public LLHTTPClient::Responder
+{
+public:
+	LLCrashLoggerResponder() 
+	{
+	}
+
+	virtual void error(U32 status, const std::string& reason)
+	{
+		gBreak = true;		
+	}
+
+	virtual void result(const LLSD& content)
+	{	
+		gBreak = true;
+		gSent = true;
+	}
+};
+
+bool LLCrashLoggerText::mainLoop()
+{
+	std::cout << "Entering main loop" << std::endl;
+	sendCrashLogs();
+	return true;	
+}
+
+void LLCrashLoggerText::updateApplication(LLString message)
+{
+	LLCrashLogger::updateApplication(message);
+	std::cout << message << std::endl;
+}
+
+LLCrashLogger::LLCrashLogger() :
+mSentCrashLogs(false)
+{
+
+}
+
+LLCrashLogger::~LLCrashLogger()
+{
+
+}
+
+void LLCrashLogger::gatherFiles()
+{
+
+	/*
+	//TODO:This function needs to be reimplemented somewhere in here...
+	if(!previous_crash && is_crash_log)
+	{
+		// Make sure the file isn't too old.
+		double age = difftime(gLaunchTime, stat_data.st_mtimespec.tv_sec);
+		
+		//			llinfos << "age is " << age << llendl;
+		
+		if(age > 60.0)
+		{
+				// The file was last modified more than 60 seconds before the crash reporter was launched.  Assume it's stale.
+			llwarns << "File " << mFilename << " is too old!" << llendl;
+			return;
+		}
+	}
+	*/
+
+	updateApplication("Gathering logs...");
+
+	// Figure out the filename of the debug log
+	LLString db_file_name = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"debug_info.log").c_str();
+	std::ifstream debug_log_file(db_file_name.c_str());
+
+	// Look for it in the debug_info.log file
+	if (debug_log_file.is_open())
+	{		
+		LLSDSerialize::fromXML(mDebugLog, debug_log_file);
+		mFileMap["SecondLifeLog"] = mDebugLog["SLLog"].asString();
+		mFileMap["SettingsXml"] = mDebugLog["SettingsFilename"].asString();
+		LLHTTPClient::setCABundle(mDebugLog["CAFilename"].asString());
+		llinfos << "Using log file from debug log " << mFileMap["SecondLifeLog"] << llendl;
+		llinfos << "Using settings file from debug log " << mFileMap["SettingsXml"] << llendl;
+	}
+	else
+	{
+		// Figure out the filename of the second life log
+		LLHTTPClient::setCABundle(gDirUtilp->getCAFile());
+		mFileMap["SecondLifeLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.log");
+		mFileMap["SettingsXml"] = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,"settings.xml");
+	}
+
+	gatherPlatformSpecificFiles();
+
+	//Use the debug log to reconstruct the URL to send the crash report to
+	mCrashHost = "https://";
+	mCrashHost += mDebugLog["CurrentSimHost"].asString();
+	mCrashHost += ":12043/crash/report";
+	mAltCrashHost = "https://";
+	mAltCrashHost += mDebugLog["GridUtilHost"].asString();
+	mAltCrashHost += ":12043/crash/report";
+
+	mCrashInfo["DebugLog"] = mDebugLog;
+	mFileMap["StatsLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stats.log");
+	mFileMap["StackTrace"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stack_trace.log");
+	
+	updateApplication("Encoding files...");
+
+	for(std::map<LLString, LLString>::iterator itr = mFileMap.begin(); itr != mFileMap.end(); ++itr)
+	{
+		std::ifstream f((*itr).second.c_str());
+		if(!f.is_open())
+		{
+			std::cout << "Can't find file " << (*itr).second.c_str() << std::endl;
+			continue;
+		}
+		std::stringstream s;
+		s << f.rdbuf();
+		mCrashInfo[(*itr).first] = s.str();
+	}
+}
+
+LLSD LLCrashLogger::constructPostData()
+{
+	LLSD ret;
+
+	if(mCrashInPreviousExec)
+	{
+		mCrashInfo["CrashInPreviousExecution"] = "Y";
+	}
+
+	return mCrashInfo;
+}
+
+S32 LLCrashLogger::loadCrashBehaviorSetting()
+{
+	std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
+
+	mCrashSettings.loadFromFile(filename);
+		
+	S32 value = mCrashSettings.getS32(CRASH_BEHAVIOR_SETTING);
+	
+	if (value < CRASH_BEHAVIOR_ASK || CRASH_BEHAVIOR_NEVER_SEND < value) return CRASH_BEHAVIOR_ASK;
+
+	return value;
+}
+
+bool LLCrashLogger::saveCrashBehaviorSetting(S32 crash_behavior)
+{
+	if (crash_behavior < CRASH_BEHAVIOR_ASK) return false;
+	if (crash_behavior > CRASH_BEHAVIOR_NEVER_SEND) return false;
+
+	mCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, crash_behavior);
+	std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
+
+	mCrashSettings.saveToFile(filename, FALSE);
+
+	return true;
+}
+
+bool LLCrashLogger::sendCrashLogs()
+{
+	gatherFiles();
+
+	LLSD post_data;
+	post_data = constructPostData();
+
+	updateApplication("Sending reports...");
+
+	std::string dump_path = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
+															   "SecondLifeCrashReport");
+	std::string report_file = dump_path + ".log";
+
+	std::ofstream out_file(report_file.c_str());
+	LLSDSerialize::toPrettyXML(post_data, out_file);
+	out_file.close();
+	LLHTTPClient::post(mCrashHost, post_data, new LLCrashLoggerResponder(), 5);
+
+	gBreak = false;
+	while(!gBreak)
+	{
+		updateApplication("Sending logs...");
+	}
+
+	if(!gSent)
+	{
+		gBreak = false;
+		LLHTTPClient::post(mAltCrashHost, post_data, new LLCrashLoggerResponder(), 5);
+
+		while(!gBreak)
+		{
+			updateApplication("Sending logs to Alternate Server...");
+		}
+	}
+	mSentCrashLogs = gSent;
+
+	return true;
+}
+
+void LLCrashLogger::updateApplication(LLString message)
+{
+	gServicePump->pump();
+    gServicePump->callback();
+}
+
+bool LLCrashLogger::init()
+{
+	// We assume that all the logs we're looking for reside on the current drive
+	gDirUtilp->initAppDirs("SecondLife");
+
+	// Default to the product name "Second Life" (this is overridden by the -name argument)
+	mProductName = "Second Life";
+	
+	mCrashSettings.declareS32(CRASH_BEHAVIOR_SETTING, CRASH_BEHAVIOR_ASK, "Controls behavior when viewer crashes "
+		"(0 = ask before sending crash report, 1 = always send crash report, 2 = never send crash report)");
+
+	llinfos << "Loading crash behavior setting" << llendl;
+	mCrashBehavior = loadCrashBehaviorSetting();
+
+	//Run through command line options
+	if(getOption("previous").isDefined())
+	{
+		llinfos << "Previous execution did not remove SecondLife.exec_marker" << llendl;
+		mCrashInPreviousExec = TRUE;
+	}
+
+	if(getOption("dialog").isDefined())
+	{
+		llinfos << "Show the user dialog" << llendl;
+		mCrashBehavior = CRASH_BEHAVIOR_ASK;
+	}
+
+	LLSD server = getOption("user");
+	if(server.isDefined())
+	{
+		mGridName = server.asString();
+		llinfos << "Got userserver " << mGridName << llendl;
+	}
+	else
+	{
+		mGridName = "agni";
+	}
+
+	LLSD name = getOption("name");
+	if(name.isDefined())
+	{	
+		mProductName = name.asString();
+	}
+
+	// If user doesn't want to send, bail out
+	if (mCrashBehavior == CRASH_BEHAVIOR_NEVER_SEND)
+	{
+		llinfos << "Crash behavior is never_send, quitting" << llendl;
+		return false;
+	}
+
+	gServicePump = new LLPumpIO(gAPRPoolp);
+	gServicePump->prime(gAPRPoolp);
+	LLHTTPClient::setPump(*gServicePump);
+	return true;
+}

Modified: branches/Branch_1-18-6-Viewer/indra/llcrashlogger/llcrashlogger.h
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llcrashlogger/llcrashlogger.h	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llcrashlogger/llcrashlogger.h	2007-12-10 02:14:07 UTC (rev 159)
@@ -1,7 +1,7 @@
-/** 
-* @file llcrashlogger.h
-* @brief Crash Logger Definition
-*
+/** 
+* @file llcrashlogger.h
+* @brief Crash Logger Definition
+*
 * $LicenseInfo:firstyear=2003&license=viewergpl$
 * 
 * Copyright (c) 2003-2007, Linden Research, Inc.
@@ -27,59 +27,59 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
-*/
-#ifndef LLCRASHLOGGER_H
-#define LLCRASHLOGGER_H
-
-#include <vector>
-
-#include "linden_common.h"
-
-#include "llapp.h"
-#include "llsd.h"
-#include "llcontrol.h"
-
-class LLCrashLogger : public LLApp
-{
-public:
-	LLCrashLogger();
-	virtual ~LLCrashLogger();
-	S32 loadCrashBehaviorSetting();
-	void gatherFiles();
-	virtual void gatherPlatformSpecificFiles() {}
-	bool saveCrashBehaviorSetting(S32 crash_behavior);
-	bool sendCrashLogs();
-	LLSD constructPostData();
-	virtual void updateApplication(LLString message = "");
-	virtual bool init();
-	virtual bool mainLoop() = 0;
-	virtual bool cleanup() { return true; }
-	void setUserText(LLString& text) { mCrashInfo["UserNotes"] = text; }
-	S32 getCrashBehavior() { return mCrashBehavior; }
-protected:
-	S32 mCrashBehavior;
-	BOOL mCrashInPreviousExec;
-	std::map<LLString, LLString> mFileMap;
-	static const int mMaxSendSize = 200000;
-	LLString mGridName;
-	LLControlGroup mCrashSettings;
-	LLString mProductName;
-	LLSD mCrashInfo;
-	LLString mCrashHost;
-	LLString mAltCrashHost;
-	LLSD mDebugLog;
-	bool mSentCrashLogs;
-};
-
-class LLCrashLoggerText : public LLCrashLogger
-{
-public:
-	LLCrashLoggerText(void) {}
-	~LLCrashLoggerText(void) {}
-
-	virtual bool mainLoop();
-	virtual void updateApplication(LLString message = "");
-};
-
-
-#endif //LLCRASHLOGGER_H
+*/
+#ifndef LLCRASHLOGGER_H
+#define LLCRASHLOGGER_H
+
+#include <vector>
+
+#include "linden_common.h"
+
+#include "llapp.h"
+#include "llsd.h"
+#include "llcontrol.h"
+
+class LLCrashLogger : public LLApp
+{
+public:
+	LLCrashLogger();
+	virtual ~LLCrashLogger();
+	S32 loadCrashBehaviorSetting();
+	void gatherFiles();
+	virtual void gatherPlatformSpecificFiles() {}
+	bool saveCrashBehaviorSetting(S32 crash_behavior);
+	bool sendCrashLogs();
+	LLSD constructPostData();
+	virtual void updateApplication(LLString message = "");
+	virtual bool init();
+	virtual bool mainLoop() = 0;
+	virtual bool cleanup() { return true; }
+	void setUserText(LLString& text) { mCrashInfo["UserNotes"] = text; }
+	S32 getCrashBehavior() { return mCrashBehavior; }
+protected:
+	S32 mCrashBehavior;
+	BOOL mCrashInPreviousExec;
+	std::map<LLString, LLString> mFileMap;
+	static const int mMaxSendSize = 200000;
+	LLString mGridName;
+	LLControlGroup mCrashSettings;
+	LLString mProductName;
+	LLSD mCrashInfo;
+	LLString mCrashHost;
+	LLString mAltCrashHost;
+	LLSD mDebugLog;
+	bool mSentCrashLogs;
+};
+
+class LLCrashLoggerText : public LLCrashLogger
+{
+public:
+	LLCrashLoggerText(void) {}
+	~LLCrashLoggerText(void) {}
+
+	virtual bool mainLoop();
+	virtual void updateApplication(LLString message = "");
+};
+
+
+#endif //LLCRASHLOGGER_H

Modified: branches/Branch_1-18-6-Viewer/indra/llimage/llimage.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llimage/llimage.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llimage/llimage.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -63,7 +63,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				GlobalOptimizations="TRUE"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="TRUE"
@@ -111,7 +110,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llvfs; ..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llimage/llimage_vc8.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llimage/llimage_vc8.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llimage/llimage_vc8.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -4,7 +4,6 @@
 	Version="8.00"
 	Name="llimage"
 	ProjectGUID="{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}"
-	RootNamespace="llimage"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -109,7 +108,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llvfs; ..\..\libraries\i686-win32\include;..\..\libraries\include\"
@@ -178,7 +176,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llvfs; ..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llimagej2coj/llimagej2coj.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llimagej2coj/llimagej2coj.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llimagej2coj/llimagej2coj.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -58,7 +58,6 @@
 			ConfigurationType="4">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				GlobalOptimizations="TRUE"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="TRUE"
@@ -100,7 +99,6 @@
 			ConfigurationType="4">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				GlobalOptimizations="FALSE"
 				InlineFunctionExpansion="0"

Modified: branches/Branch_1-18-6-Viewer/indra/llinventory/llinventory.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llinventory/llinventory.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llinventory/llinventory.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -63,7 +63,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -106,7 +105,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llinventory/llinventory_vc8.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llinventory/llinventory_vc8.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llinventory/llinventory_vc8.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -4,7 +4,6 @@
 	Version="8.00"
 	Name="llinventory"
 	ProjectGUID="{328D1968-924F-4863-AAE8-5F9A95BA68E5}"
-	RootNamespace="llinventory"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -109,7 +108,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -176,7 +174,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llmath/llmath.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llmath/llmath.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llmath/llmath.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -63,7 +63,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llcommon;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -106,7 +105,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llmath/llmath_vc8.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llmath/llmath_vc8.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llmath/llmath_vc8.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -4,7 +4,6 @@
 	Version="8.00"
 	Name="llmath"
 	ProjectGUID="{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}"
-	RootNamespace="llmath"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -109,7 +108,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llcommon;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -176,7 +174,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llmedia/llmedia.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llmedia/llmedia.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llmedia/llmedia.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -66,7 +66,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				GlobalOptimizations="FALSE"
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="FALSE"
@@ -118,7 +117,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				GlobalOptimizations="FALSE"
 				InlineFunctionExpansion="0"

Modified: branches/Branch_1-18-6-Viewer/indra/llmedia/llmedia_vc8.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llmedia/llmedia_vc8.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llmedia/llmedia_vc8.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -111,7 +111,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="false"
 				AdditionalIncludeDirectories="..\llcommon;..\llrender;..\llwindow;..\llimage;..\llmath;..\llvfs;..\llmessage;..\llui;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
@@ -184,7 +183,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="false"

Modified: branches/Branch_1-18-6-Viewer/indra/llmessage/llmessage.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llmessage/llmessage.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llmessage/llmessage.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -64,7 +64,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -107,7 +106,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llmessage/llmessage_vc8.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llmessage/llmessage_vc8.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llmessage/llmessage_vc8.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -109,7 +109,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -176,7 +175,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llprimitive/llprimitive.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llprimitive/llprimitive.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llprimitive/llprimitive.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -63,7 +63,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -106,7 +105,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llprimitive/llprimitive_vc8.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llprimitive/llprimitive_vc8.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llprimitive/llprimitive_vc8.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -4,7 +4,6 @@
 	Version="8.00"
 	Name="llprimitive"
 	ProjectGUID="{FCC4483C-5B84-4944-B91F-4589A219BC0B}"
-	RootNamespace="llprimitive"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -109,7 +108,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -176,7 +174,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llrender/llrender.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llrender/llrender.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llrender/llrender.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -63,7 +63,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				GlobalOptimizations="TRUE"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="TRUE"
@@ -111,7 +110,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llimage;..\llwindow;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llrender/llrender_vc8.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llrender/llrender_vc8.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llrender/llrender_vc8.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -4,7 +4,6 @@
 	Version="8.00"
 	Name="llrender"
 	ProjectGUID="{2ADE3C14-94C4-40BF-B033-70F3C954EE90}"
-	RootNamespace="llrender"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -109,7 +108,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llimage;..\llwindow;..\..\libraries\i686-win32\include;..\..\libraries\include\"
@@ -178,7 +176,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llimage;..\llwindow;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llui/llui.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llui/llui.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llui/llui.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -63,7 +63,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -106,7 +105,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llui/llui_vc8.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llui/llui_vc8.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llui/llui_vc8.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -4,7 +4,6 @@
 	Version="8.00"
 	Name="llui"
 	ProjectGUID="{DE55D666-6A3D-476C-937F-109269B83681}"
-	RootNamespace="llui"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -109,7 +108,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -176,7 +174,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llvfs/llvfs.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llvfs/llvfs.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llvfs/llvfs.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -63,7 +63,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\;..\llcommon;..\llmath"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -106,7 +105,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\;..\llcommon;..\llmath"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llvfs/llvfs_vc8.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llvfs/llvfs_vc8.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llvfs/llvfs_vc8.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -4,7 +4,6 @@
 	Version="8.00"
 	Name="llvfs"
 	ProjectGUID="{D37774F4-253D-4760-BF64-372A943224A1}"
-	RootNamespace="llvfs"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -109,7 +108,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\;..\llcommon;..\llmath"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -176,7 +174,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\;..\llcommon;..\llmath"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llwindow/llwindow.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llwindow/llwindow.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llwindow/llwindow.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -63,7 +63,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\..\libraries\i686-win32\include;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -151,7 +150,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llwindow/llwindow_vc8.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llwindow/llwindow_vc8.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llwindow/llwindow_vc8.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -108,7 +108,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
 				TreatWChar_tAsBuiltInType="false"
@@ -239,7 +238,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llxml/llxml.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llxml/llxml.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llxml/llxml.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -63,7 +63,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -106,7 +105,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/llxml/llxml_vc8.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/llxml/llxml_vc8.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/llxml/llxml_vc8.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -4,7 +4,6 @@
 	Version="8.00"
 	Name="llxml"
 	ProjectGUID="{A5470DA6-0C3A-4602-B930-43DB25511A59}"
-	RootNamespace="llxml"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -109,7 +108,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -176,7 +174,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\..\libraries\i686-win32\include;..\..\libraries\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/lscript/lscript_compile/lscript_compile.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/lscript/lscript_compile/lscript_compile.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/lscript/lscript_compile/lscript_compile.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -64,7 +64,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -108,7 +107,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/lscript/lscript_compile/lscript_compile_vc8.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/lscript/lscript_compile/lscript_compile_vc8.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/lscript/lscript_compile/lscript_compile_vc8.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -109,7 +109,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -176,7 +175,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/lscript/lscript_execute/lscript_execute.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/lscript/lscript_execute/lscript_execute.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/lscript/lscript_execute/lscript_execute.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -63,7 +63,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -106,7 +105,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/lscript/lscript_execute/lscript_execute_vc8.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/lscript/lscript_execute/lscript_execute_vc8.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/lscript/lscript_execute/lscript_execute_vc8.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -4,7 +4,6 @@
 	Version="8.00"
 	Name="lscript_execute"
 	ProjectGUID="{F882263E-4F2A-43D9-A45A-FA4C8EC66552}"
-	RootNamespace="lscript_execute"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -109,7 +108,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -176,7 +174,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/lscript/lscript_library/lscript_library.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/lscript/lscript_library/lscript_library.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/lscript/lscript_library/lscript_library.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -63,7 +63,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -106,7 +105,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/lscript/lscript_library/lscript_library_vc8.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/lscript/lscript_library/lscript_library_vc8.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/lscript/lscript_library/lscript_library_vc8.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -4,7 +4,6 @@
 	Version="8.00"
 	Name="lscript_library"
 	ProjectGUID="{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}"
-	RootNamespace="lscript_library"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -109,7 +108,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
 				RuntimeLibrary="0"
@@ -176,7 +174,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

Modified: branches/Branch_1-18-6-Viewer/indra/newview/CrashReporter.nib/classes.nib
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/newview/CrashReporter.nib/classes.nib	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/newview/CrashReporter.nib/classes.nib	2007-12-10 02:14:07 UTC (rev 159)
@@ -1,8 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBVersion</key>
-	<string>1</string>
-</dict>
-</plist>
+{
+IBClasses = ();
+IBVersion = 1;
+}

Modified: branches/Branch_1-18-6-Viewer/indra/newview/CrashReporter.nib/info.nib
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/newview/CrashReporter.nib/info.nib	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/newview/CrashReporter.nib/info.nib	2007-12-10 02:14:07 UTC (rev 159)
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>IBDocumentLocation</key>
+	<string>791 275 476 367 0 0 1600 1178 </string>
 	<key>IBFramework Version</key>
-	<string>629</string>
-	<key>IBLastKnownRelativeProjectPath</key>
-	<string>../macview.xcodeproj</string>
-	<key>IBOldestOS</key>
-	<integer>5</integer>
+	<string>446.1</string>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>193</integer>
+		<integer>166</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>9B18</string>
+	<string>8R2218</string>
 	<key>targetFramework</key>
 	<string>IBCarbonFramework</string>
 </dict>

Modified: branches/Branch_1-18-6-Viewer/indra/newview/CrashReporter.nib/objects.xib
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/newview/CrashReporter.nib/objects.xib	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/newview/CrashReporter.nib/objects.xib	2007-12-10 02:14:07 UTC (rev 159)
@@ -1,59 +1,59 @@
 <?xml version="1.0" standalone="yes"?>
 <object class="NSIBObjectData">
+  <string name="targetFramework">IBCarbonFramework</string>
   <object name="rootObject" class="NSCustomObject" id="1">
+    <string name="customClass">NSApplication</string>
   </object>
   <array count="7" name="allObjects">
-    <object class="IBCarbonStaticText" id="181">
-      <string name="title">Second Life appears to have crashed or frozen the last time it ran.&#10;&#10;This crash reporter collects information about your computer&apos;s hardware configuration, operating system, and some Second Life logs, all of which are used for debugging purposes only.&#10;&#10;In the space below, please briefly describe what you were doing or trying to do just prior to the crash. Thank you for your help!&#10;&#10;This report is NOT read by Customer Support. If you have billing or other questions, please go to: http://www.secondlife.com/support/&#10;&#10;If you don&apos;t wish to send Linden Lab a crash report, press Cancel.&#10;</string>
-      <string name="bounds">20 20 231 487 </string>
-    </object>
-    <object class="IBCarbonButton" id="183">
-      <ostype name="command">not!</ostype>
-      <int name="buttonType">2</int>
-      <string name="title">Don&apos;t Send</string>
-      <string name="bounds">414 390 434 487 </string>
-    </object>
-    <object class="IBCarbonRootControl" id="167">
-      <array count="5" name="subviews">
-        <reference idRef="181"/>
-        <object class="IBCarbonButton" id="182">
-          <ostype name="command">ok  </ostype>
-          <string name="title">Send Report</string>
-          <string name="bounds">414 273 434 378 </string>
-        </object>
-        <reference idRef="183"/>
-        <object class="IBCarbonEditText" id="185">
-          <ostype name="controlSignature">text</ostype>
-          <boolean name="isUnicode">TRUE</boolean>
-          <string name="bounds">242 23 391 484 </string>
-        </object>
-        <object class="IBCarbonCheckBox" id="193">
-          <ostype name="controlSignature">remb</ostype>
-          <int name="initialState">1</int>
-          <string name="title">Remember This Choice</string>
-          <string name="bounds">415 20 433 186 </string>
-        </object>
-      </array>
-      <string name="bounds">0 0 454 507 </string>
-    </object>
     <object class="IBCarbonWindow" id="166">
+      <string name="windowRect">257 653 711 1160 </string>
+      <string name="title">Second Life Crash Logger</string>
+      <object name="rootControl" class="IBCarbonRootControl" id="167">
+        <string name="bounds">0 0 454 507 </string>
+        <array count="5" name="subviews">
+          <object class="IBCarbonStaticText" id="181">
+            <string name="bounds">20 20 231 487 </string>
+            <string name="title">Second Life appears to have crashed or frozen the last time it ran.&#10;&#10;This crash reporter collects information about your computer&apos;s hardware configuration, operating system, and some Second Life logs, all of which are used for debugging purposes only.&#10;&#10;In the space below, please briefly describe what you were doing or trying to do just prior to the crash.  Thank you for your help!&#10;&#10;This report is NOT read by Customer Support. If you have billing or other questions, please go to: http://www.secondlife.com/support/&#10;&#10;If you don&apos;t wish to send Linden Lab a crash report, press Cancel.&#10;</string>
+          </object>
+          <object class="IBCarbonButton" id="182">
+            <string name="bounds">414 273 434 378 </string>
+            <string name="title">Send Report</string>
+            <ostype name="command">ok  </ostype>
+          </object>
+          <object class="IBCarbonButton" id="183">
+            <string name="bounds">414 390 434 487 </string>
+            <string name="title">Don&apos;t Send</string>
+            <ostype name="command">not!</ostype>
+            <int name="buttonType">2</int>
+          </object>
+          <object class="IBCarbonEditText" id="185">
+            <string name="bounds">242 23 391 484 </string>
+            <ostype name="controlSignature">text</ostype>
+            <boolean name="isUnicode">TRUE</boolean>
+          </object>
+          <object class="IBCarbonCheckBox" id="193">
+            <string name="bounds">415 20 433 186 </string>
+            <string name="title">Remember This Choice</string>
+			<ostype name="controlSignature">remb</ostype>
+          </object>
+        </array>
+      </object>
       <int name="carbonWindowClass">2</int>
       <int name="themeBrush">3</int>
       <int name="windowPosition">7</int>
-      <string name="title">Second Life Crash Logger</string>
-      <reference name="rootControl" idRef="167"/>
-      <string name="windowRect">257 653 711 1160 </string>
-      <string name="ScreenRectAtEncodeTime">0 0 768 1024 </string>
     </object>
-    <reference idRef="193"/>
-    <reference idRef="185"/>
+    <reference idRef="167"/>
+    <reference idRef="181"/>
     <reference idRef="182"/>
+    <reference idRef="183"/>
+    <reference idRef="185"/>
+    <reference idRef="193"/>
   </array>
   <array count="7" name="allParents">
+    <reference idRef="1"/>
+    <reference idRef="166"/>
     <reference idRef="167"/>
     <reference idRef="167"/>
-    <reference idRef="166"/>
-    <reference idRef="1"/>
     <reference idRef="167"/>
     <reference idRef="167"/>
     <reference idRef="167"/>
@@ -64,6 +64,5 @@
     <string>File&apos;s Owner</string>
     <reference idRef="1"/>
   </dictionary>
-  <string name="targetFramework">IBCarbonFramework</string>
   <unsigned_int name="nextObjectID">194</unsigned_int>
 </object>

Modified: branches/Branch_1-18-6-Viewer/indra/newview/llpanellogin.cpp
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/newview/llpanellogin.cpp	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/newview/llpanellogin.cpp	2007-12-10 02:14:07 UTC (rev 159)
@@ -304,9 +304,6 @@
 	LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(this, "login_html");
 	if ( web_browser )
 	{
-		// observe browser events
-		web_browser->addObserver( this );
-
 		// don't make it a tab stop until SL-27594 is fixed
 		web_browser->setTabStop(FALSE);
 
@@ -658,22 +655,6 @@
 	web_browser->navigateTo( oStr.str() );
 }
 
-#if LL_LIBXUL_ENABLED
-void LLPanelLogin::onNavigateComplete( const EventType& eventIn )
-{
-	LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(sInstance, "login_html");
-	if (web_browser)
-	{
-		// *HACK HACK HACK HACK!
-		/* Stuff a Tab key into the browser now so that the first field will
-		** get the focus!  The embedded javascript on the page that properly
-		** sets the initial focus in a real web browser is not working inside
-		** the viewer, so this is an UGLY HACK WORKAROUND for now.
-		*/
-		web_browser->handleKey(KEY_TAB, MASK_NONE, false);
-	}
-}
-#endif
 
 //---------------------------------------------------------------------------
 // Protected methods

Modified: branches/Branch_1-18-6-Viewer/indra/newview/llpanellogin.h
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/newview/llpanellogin.h	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/newview/llpanellogin.h	2007-12-10 02:14:07 UTC (rev 159)
@@ -39,7 +39,6 @@
 #include "llviewerimage.h"
 #include "llstring.h"
 #include "llmd5.h"
-#include "llwebbrowserctrl.h"
 
 class LLTextBox;
 class LLLineEditor;
@@ -65,9 +64,6 @@
 
 class LLPanelLogin
 :	public LLPanel
-#if LL_LIBXUL_ENABLED
-	, public LLWebBrowserCtrlObserver
-#endif
 {
 public:
 	LLPanelLogin(const LLRect &rect, BOOL show_server, 
@@ -93,11 +89,6 @@
 private:
 	static void onClickQuit(void*);
 	static void onClickVersion(void*);
-
-#if LL_LIBXUL_ENABLED
-	// browser observer impls
-	virtual void onNavigateComplete( const EventType& eventIn );
-#endif
 	
 private:
 	LLPointer<LLViewerImage> mLogoImage;

Modified: branches/Branch_1-18-6-Viewer/indra/newview/llselectmgr.cpp
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/newview/llselectmgr.cpp	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/newview/llselectmgr.cpp	2007-12-10 02:14:07 UTC (rev 159)
@@ -5825,8 +5825,7 @@
 		iterator nextiter = iter++;
 		LLSelectNode* node = *nextiter;
 		LLViewerObject* object = (*nextiter)->getObject();
-		S32 num_tes = llmin((S32)object->getNumTEs(), (S32)object->getNumFaces()); // avatars have TEs but no faces
-		for (S32 te = 0; te < num_tes; ++te)
+		for (S32 te = 0; te < object->getNumTEs(); ++te)
 		{
 			if (node->isTESelected(te))
 			{

Modified: branches/Branch_1-18-6-Viewer/indra/newview/llviewermenu.cpp
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/newview/llviewermenu.cpp	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/newview/llviewermenu.cpp	2007-12-10 02:14:07 UTC (rev 159)
@@ -1072,7 +1072,7 @@
 										&menu_check_control,
 										(void*)"ShowConsoleWindow"));
 
-	if(gQAMode)// && !gInProductionGrid)
+	if(gQAMode && !gInProductionGrid)
 	{
 		LLMenuGL* sub = NULL;
 		sub = new LLMenuGL("Debugging");

Modified: branches/Branch_1-18-6-Viewer/indra/newview/llwebbrowserctrl.cpp
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/newview/llwebbrowserctrl.cpp	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/newview/llwebbrowserctrl.cpp	2007-12-10 02:14:07 UTC (rev 159)
@@ -217,21 +217,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-BOOL LLWebBrowserCtrl::handleDoubleClick( S32 x, S32 y, MASK mask )
-{
-	llinfos << "JAMESDEBUG handleDoubleClick web ctrl" << llendl;
-	convertInputCoords(x, y);
-	//LLMozLib::getInstance()->mouseLeftDoubleClick( mEmbeddedBrowserWindowId, x, y );
-
-	gViewerWindow->setMouseCapture( this );
-
-	setFocus( TRUE );
-
-	return TRUE;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
 void LLWebBrowserCtrl::onFocusReceived()
 {
 	LLMozLib::getInstance()->focusBrowser( mEmbeddedBrowserWindowId, true );

Modified: branches/Branch_1-18-6-Viewer/indra/newview/llwebbrowserctrl.h
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/newview/llwebbrowserctrl.h	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/newview/llwebbrowserctrl.h	2007-12-10 02:14:07 UTC (rev 159)
@@ -181,7 +181,6 @@
 		virtual BOOL handleHover( S32 x, S32 y, MASK mask );
 		virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask );
 		virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask );
-		virtual BOOL handleDoubleClick( S32 x, S32 y, MASK mask );
 		virtual BOOL handleScrollWheel( S32 x, S32 y, S32 clicks );
 
 		// navigation

Modified: branches/Branch_1-18-6-Viewer/indra/newview/newview.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/newview/newview.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/newview/newview.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -81,7 +81,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				GlobalOptimizations="FALSE"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="TRUE"
@@ -150,7 +149,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include;..\..\libraries\include\zlib;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE;LL_RELEASE_FOR_DOWNLOAD;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
 				RuntimeLibrary="0"
@@ -217,7 +215,6 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include;..\..\libraries\include\zlib;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"

Modified: branches/Branch_1-18-6-Viewer/indra/newview/newview_vc8.vcproj
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/newview/newview_vc8.vcproj	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/newview/newview_vc8.vcproj	2007-12-10 02:14:07 UTC (rev 159)
@@ -137,7 +137,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
@@ -236,7 +235,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;LL_RELEASE_FOR_DOWNLOAD;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
 				RuntimeLibrary="0"
@@ -261,7 +259,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib-vc80.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_compile.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib"
+				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib-vc80.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_compile.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib"
 				OutputFile="$(ConfigurationName)/SecondLife.exe"
 				LinkIncremental="0"
 				AdditionalLibraryDirectories="&quot;../lib_release/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
@@ -327,7 +325,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"

Modified: branches/Branch_1-18-6-Viewer/indra/win_crash_logger/llcrashloggerwindows.cpp
===================================================================
--- branches/Branch_1-18-6-Viewer/indra/win_crash_logger/llcrashloggerwindows.cpp	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/indra/win_crash_logger/llcrashloggerwindows.cpp	2007-12-10 02:14:07 UTC (rev 159)
@@ -319,7 +319,7 @@
 	else if (mCrashBehavior == CRASH_BEHAVIOR_ASK)
 	{
 		gHwndReport = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PREVREPORTBOX), 0, NULL);
-		LRESULT result = SendDlgItemMessage(gHwndReport, IDC_CHECK_AUTO, BM_SETCHECK, 1, 0);
+
 		// Include the product name in the caption and various dialog items.
 		ProcessCaption(gHwndReport);
 		ProcessDlgItemText(gHwndReport, IDC_STATIC_MSG);

Modified: branches/Branch_1-18-6-Viewer/libraries/include/llmozlib.h
===================================================================
--- branches/Branch_1-18-6-Viewer/libraries/include/llmozlib.h	2007-12-09 22:45:07 UTC (rev 158)
+++ branches/Branch_1-18-6-Viewer/libraries/include/llmozlib.h	2007-12-10 02:14:07 UTC (rev 159)
@@ -158,10 +158,6 @@
 		// mouse/keyboard interaction
 		bool mouseDown( int browserWindowIdIn, int xPosIn, int yPosIn );
 		bool mouseUp( int browserWindowIdIn, int xPosIn, int yPosIn );
-		
-		// send a mouse left button double click to a browser window at given XY in browser space
-		bool mouseLeftDoubleClick( int browserWindowIdIn, int xPosIn, int yPosIn );
-		
 		bool mouseMove( int browserWindowIdIn, int xPosIn, int yPosIn );
 		bool keyPress( int browserWindowIdIn, int keyCodeIn );
 		bool unicodeInput ( int browserWindowIdIn, unsigned long uni_char );



More information about the sldev-commits mailing list