From 1e8e051fafa147fc3375bf7693c781e3be17b6d4 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:22 -0500
Subject: Second Life viewer sources 1.18.6.1-RC
---
linden/indra/llaudio/llaudio.vcproj | 2 +
linden/indra/llaudio/llaudio_vc8.vcproj | 2 +
linden/indra/llcharacter/llcharacter.vcproj | 2 +
linden/indra/llcharacter/llcharacter_vc8.vcproj | 3 +
linden/indra/llcommon/indra_constants.h | 2 +-
linden/indra/llcommon/llcommon.vcproj | 2 +
linden/indra/llcommon/llcommon_vc8.vcproj | 2 +
linden/indra/llcommon/llversionviewer.h | 2 +-
linden/indra/llimage/llimage.vcproj | 2 +
linden/indra/llimage/llimage_vc8.vcproj | 3 +
linden/indra/llimagej2coj/llimagej2coj.vcproj | 2 +
linden/indra/llinventory/llinventory.vcproj | 2 +
linden/indra/llinventory/llinventory_vc8.vcproj | 3 +
linden/indra/llmath/llmath.vcproj | 2 +
linden/indra/llmath/llmath_vc8.vcproj | 3 +
linden/indra/llmedia/llmedia.vcproj | 2 +
linden/indra/llmedia/llmedia_vc8.vcproj | 2 +
linden/indra/llmessage/llhttpclient.cpp | 5 ++
linden/indra/llmessage/llhttpclient.h | 1 +
linden/indra/llmessage/llmessage.vcproj | 2 +
linden/indra/llmessage/llmessage_vc8.vcproj | 2 +
linden/indra/llmessage/llurlrequest.cpp | 7 ++
linden/indra/llmessage/llurlrequest.h | 1 +
linden/indra/llprimitive/llprimitive.vcproj | 2 +
linden/indra/llprimitive/llprimitive_vc8.vcproj | 3 +
linden/indra/llrender/llrender.vcproj | 2 +
linden/indra/llrender/llrender_vc8.vcproj | 3 +
linden/indra/llui/llui.vcproj | 2 +
linden/indra/llui/llui_vc8.vcproj | 3 +
linden/indra/llvfs/llvfs.vcproj | 2 +
linden/indra/llvfs/llvfs_vc8.vcproj | 3 +
linden/indra/llwindow/llwindow.vcproj | 2 +
linden/indra/llwindow/llwindow_vc8.vcproj | 2 +
linden/indra/llxml/llxml.vcproj | 2 +
linden/indra/llxml/llxml_vc8.vcproj | 3 +
.../lscript/lscript_compile/lscript_compile.vcproj | 2 +
.../lscript_compile/lscript_compile_vc8.vcproj | 2 +
.../lscript/lscript_execute/lscript_execute.vcproj | 2 +
.../lscript_execute/lscript_execute_vc8.vcproj | 3 +
.../lscript/lscript_library/lscript_library.vcproj | 2 +
.../lscript_library/lscript_library_vc8.vcproj | 3 +
linden/indra/newview/CrashReporter.nib/classes.nib | 12 ++--
linden/indra/newview/CrashReporter.nib/info.nib | 14 ++--
linden/indra/newview/CrashReporter.nib/objects.xib | 83 +++++++++++-----------
.../indra/newview/English.lproj/InfoPlist.strings | 4 +-
linden/indra/newview/Info-SecondLife.plist | 2 +-
linden/indra/newview/app_settings/colors_base.xml | 1 +
linden/indra/newview/llappviewer.cpp | 2 +-
linden/indra/newview/llcontroldef.cpp | 1 +
linden/indra/newview/llfolderview.cpp | 31 +++++++-
linden/indra/newview/llfolderview.h | 3 +
linden/indra/newview/llpanelavatar.cpp | 9 +--
linden/indra/newview/llpanellogin.cpp | 49 ++++++++++---
linden/indra/newview/llpanellogin.h | 9 +++
linden/indra/newview/llselectmgr.cpp | 3 +-
linden/indra/newview/llviewermenu.cpp | 2 +-
linden/indra/newview/llviewermessage.cpp | 17 ++---
linden/indra/newview/llwebbrowserctrl.cpp | 15 ++++
linden/indra/newview/llwebbrowserctrl.h | 1 +
.../newview/macview.xcodeproj/project.pbxproj | 21 ++++++
linden/indra/newview/newview.vcproj | 5 +-
linden/indra/newview/newview_vc8.vcproj | 5 +-
linden/indra/newview/releasenotes.txt | 14 ++++
linden/indra/newview/res/newViewRes.rc | 8 +--
.../indra/newview/skins/xui/en-us/menu_login.xml | 6 +-
.../indra/newview/skins/xui/en-us/panel_avatar.xml | 10 +--
linden/indra/test/llhttpclient_tut.cpp | 8 +++
.../win_crash_logger/llcrashloggerwindows.cpp | 2 +-
linden/libraries/include/llmozlib.h | 4 ++
69 files changed, 344 insertions(+), 96 deletions(-)
diff --git a/linden/indra/llaudio/llaudio.vcproj b/linden/indra/llaudio/llaudio.vcproj
index 7073b88..dee6916 100644
--- a/linden/indra/llaudio/llaudio.vcproj
+++ b/linden/indra/llaudio/llaudio.vcproj
@@ -64,6 +64,7 @@
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"
@@ -106,6 +107,7 @@
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"
diff --git a/linden/indra/llaudio/llaudio_vc8.vcproj b/linden/indra/llaudio/llaudio_vc8.vcproj
index d0b4bb4..6ca3e67 100644
--- a/linden/indra/llaudio/llaudio_vc8.vcproj
+++ b/linden/indra/llaudio/llaudio_vc8.vcproj
@@ -109,6 +109,7 @@
/>
<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"
@@ -175,6 +176,7 @@
/>
<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"
diff --git a/linden/indra/llcharacter/llcharacter.vcproj b/linden/indra/llcharacter/llcharacter.vcproj
index c8a9bc4..82f17ae 100644
--- a/linden/indra/llcharacter/llcharacter.vcproj
+++ b/linden/indra/llcharacter/llcharacter.vcproj
@@ -63,6 +63,7 @@
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"
@@ -105,6 +106,7 @@
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"
diff --git a/linden/indra/llcharacter/llcharacter_vc8.vcproj b/linden/indra/llcharacter/llcharacter_vc8.vcproj
index 415b74f..00ceb88 100644
--- a/linden/indra/llcharacter/llcharacter_vc8.vcproj
+++ b/linden/indra/llcharacter/llcharacter_vc8.vcproj
@@ -4,6 +4,7 @@
Version="8.00"
Name="llcharacter"
ProjectGUID="{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}"
+ RootNamespace="llcharacter"
Keyword="Win32Proj"
>
<Platforms>
@@ -108,6 +109,7 @@
/>
<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"
@@ -174,6 +176,7 @@
/>
<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"
diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index b7d3578..0195893 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -336,7 +336,7 @@ const U32 MAP_ITEM_CLASSIFIED = 0x08;
// Crash reporter behavior
const char* const CRASH_SETTINGS_FILE = "crash_settings.xml";
-const char* const CRASH_BEHAVIOR_SETTING = "CrashBehavior";
+const char* const CRASH_BEHAVIOR_SETTING = "CrashLogBehavior";
const S32 CRASH_BEHAVIOR_ASK = 0;
const S32 CRASH_BEHAVIOR_ALWAYS_SEND = 1;
const S32 CRASH_BEHAVIOR_NEVER_SEND = 2;
diff --git a/linden/indra/llcommon/llcommon.vcproj b/linden/indra/llcommon/llcommon.vcproj
index 0ab544e..f16092b 100644
--- a/linden/indra/llcommon/llcommon.vcproj
+++ b/linden/indra/llcommon/llcommon.vcproj
@@ -64,6 +64,7 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
GlobalOptimizations="TRUE"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="TRUE"
@@ -111,6 +112,7 @@
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"
diff --git a/linden/indra/llcommon/llcommon_vc8.vcproj b/linden/indra/llcommon/llcommon_vc8.vcproj
index 4790b61..6f8f26b 100644
--- a/linden/indra/llcommon/llcommon_vc8.vcproj
+++ b/linden/indra/llcommon/llcommon_vc8.vcproj
@@ -109,6 +109,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\"
@@ -177,6 +178,7 @@
/>
<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"
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index f9f3bf2..82b80ea 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -35,7 +35,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 18;
const S32 LL_VERSION_PATCH = 6;
-const S32 LL_VERSION_BUILD = 0;
+const S32 LL_VERSION_BUILD = 1;
const char * const LL_CHANNEL = "Second Life Release";
diff --git a/linden/indra/llimage/llimage.vcproj b/linden/indra/llimage/llimage.vcproj
index 984d84e..aeb3e8e 100644
--- a/linden/indra/llimage/llimage.vcproj
+++ b/linden/indra/llimage/llimage.vcproj
@@ -63,6 +63,7 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
GlobalOptimizations="TRUE"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="TRUE"
@@ -110,6 +111,7 @@
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"
diff --git a/linden/indra/llimage/llimage_vc8.vcproj b/linden/indra/llimage/llimage_vc8.vcproj
index dd15d59..7030436 100644
--- a/linden/indra/llimage/llimage_vc8.vcproj
+++ b/linden/indra/llimage/llimage_vc8.vcproj
@@ -4,6 +4,7 @@
Version="8.00"
Name="llimage"
ProjectGUID="{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}"
+ RootNamespace="llimage"
Keyword="Win32Proj"
>
<Platforms>
@@ -108,6 +109,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llvfs; ..\..\libraries\i686-win32\include;..\..\libraries\include\"
@@ -176,6 +178,7 @@
/>
<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"
diff --git a/linden/indra/llimagej2coj/llimagej2coj.vcproj b/linden/indra/llimagej2coj/llimagej2coj.vcproj
index 737673b..637c81f 100755
--- a/linden/indra/llimagej2coj/llimagej2coj.vcproj
+++ b/linden/indra/llimagej2coj/llimagej2coj.vcproj
@@ -58,6 +58,7 @@
ConfigurationType="4">
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
GlobalOptimizations="TRUE"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="TRUE"
@@ -99,6 +100,7 @@
ConfigurationType="4">
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
Optimization="0"
GlobalOptimizations="FALSE"
InlineFunctionExpansion="0"
diff --git a/linden/indra/llinventory/llinventory.vcproj b/linden/indra/llinventory/llinventory.vcproj
index 66c580e..7155d29 100644
--- a/linden/indra/llinventory/llinventory.vcproj
+++ b/linden/indra/llinventory/llinventory.vcproj
@@ -63,6 +63,7 @@
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"
@@ -105,6 +106,7 @@
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"
diff --git a/linden/indra/llinventory/llinventory_vc8.vcproj b/linden/indra/llinventory/llinventory_vc8.vcproj
index 2763cac..306e6a5 100644
--- a/linden/indra/llinventory/llinventory_vc8.vcproj
+++ b/linden/indra/llinventory/llinventory_vc8.vcproj
@@ -4,6 +4,7 @@
Version="8.00"
Name="llinventory"
ProjectGUID="{328D1968-924F-4863-AAE8-5F9A95BA68E5}"
+ RootNamespace="llinventory"
Keyword="Win32Proj"
>
<Platforms>
@@ -108,6 +109,7 @@
/>
<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"
@@ -174,6 +176,7 @@
/>
<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"
diff --git a/linden/indra/llmath/llmath.vcproj b/linden/indra/llmath/llmath.vcproj
index f2d1279..79e472a 100644
--- a/linden/indra/llmath/llmath.vcproj
+++ b/linden/indra/llmath/llmath.vcproj
@@ -63,6 +63,7 @@
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"
@@ -105,6 +106,7 @@
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"
diff --git a/linden/indra/llmath/llmath_vc8.vcproj b/linden/indra/llmath/llmath_vc8.vcproj
index 03d75c3..ed4193d 100644
--- a/linden/indra/llmath/llmath_vc8.vcproj
+++ b/linden/indra/llmath/llmath_vc8.vcproj
@@ -4,6 +4,7 @@
Version="8.00"
Name="llmath"
ProjectGUID="{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}"
+ RootNamespace="llmath"
Keyword="Win32Proj"
>
<Platforms>
@@ -108,6 +109,7 @@
/>
<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"
@@ -174,6 +176,7 @@
/>
<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"
diff --git a/linden/indra/llmedia/llmedia.vcproj b/linden/indra/llmedia/llmedia.vcproj
index 93c11b2..da87e26 100644
--- a/linden/indra/llmedia/llmedia.vcproj
+++ b/linden/indra/llmedia/llmedia.vcproj
@@ -66,6 +66,7 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
GlobalOptimizations="FALSE"
InlineFunctionExpansion="0"
EnableIntrinsicFunctions="FALSE"
@@ -117,6 +118,7 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
Optimization="0"
GlobalOptimizations="FALSE"
InlineFunctionExpansion="0"
diff --git a/linden/indra/llmedia/llmedia_vc8.vcproj b/linden/indra/llmedia/llmedia_vc8.vcproj
index 2bc8014..e343f1e 100644
--- a/linden/indra/llmedia/llmedia_vc8.vcproj
+++ b/linden/indra/llmedia/llmedia_vc8.vcproj
@@ -111,6 +111,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
InlineFunctionExpansion="0"
EnableIntrinsicFunctions="false"
AdditionalIncludeDirectories="..\llcommon;..\llrender;..\llwindow;..\llimage;..\llmath;..\llvfs;..\llmessage;..\llui;"..\..\libraries\i686-win32\include";..\..\libraries\include\;"..\..\libraries\i686-win32\include\quicktime""
@@ -183,6 +184,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
Optimization="0"
InlineFunctionExpansion="0"
EnableIntrinsicFunctions="false"
diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index 7144f13..bf5fa40 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -325,6 +325,11 @@ static void request(
request(url, method, body_injector, responder, LLSD(), timeout);
}
+void LLHTTPClient::head(const std::string& url, ResponderPtr responder, const F32 timeout)
+{
+ request(url, LLURLRequest::HTTP_HEAD, NULL, responder, timeout);
+}
+
void LLHTTPClient::get(const std::string& url, ResponderPtr responder, const LLSD& headers, const F32 timeout)
{
request(url, LLURLRequest::HTTP_GET, NULL, responder, headers, timeout);
diff --git a/linden/indra/llmessage/llhttpclient.h b/linden/indra/llmessage/llhttpclient.h
index 8c2309c..6323def 100644
--- a/linden/indra/llmessage/llhttpclient.h
+++ b/linden/indra/llmessage/llhttpclient.h
@@ -89,6 +89,7 @@ public:
typedef boost::intrusive_ptr<Responder> ResponderPtr;
+ static void head(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
static void get(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
static void get(const std::string& url, ResponderPtr, const LLSD& headers, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
static void get(const std::string& url, const LLSD& query, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
diff --git a/linden/indra/llmessage/llmessage.vcproj b/linden/indra/llmessage/llmessage.vcproj
index dcc1202..64551bd 100644
--- a/linden/indra/llmessage/llmessage.vcproj
+++ b/linden/indra/llmessage/llmessage.vcproj
@@ -64,6 +64,7 @@
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"
@@ -106,6 +107,7 @@
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"
diff --git a/linden/indra/llmessage/llmessage_vc8.vcproj b/linden/indra/llmessage/llmessage_vc8.vcproj
index eec76e5..e16a52a 100644
--- a/linden/indra/llmessage/llmessage_vc8.vcproj
+++ b/linden/indra/llmessage/llmessage_vc8.vcproj
@@ -109,6 +109,7 @@
/>
<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"
@@ -175,6 +176,7 @@
/>
<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"
diff --git a/linden/indra/llmessage/llurlrequest.cpp b/linden/indra/llmessage/llurlrequest.cpp
index 857f804..8df4be4 100644
--- a/linden/indra/llmessage/llurlrequest.cpp
+++ b/linden/indra/llmessage/llurlrequest.cpp
@@ -428,6 +428,13 @@ bool LLURLRequest::configure()
NULL);
switch(mAction)
{
+ case HTTP_HEAD:
+ curl_easy_setopt(mDetail->mCurl, CURLOPT_HEADER, 1);
+ curl_easy_setopt(mDetail->mCurl, CURLOPT_NOBODY, 1);
+ curl_easy_setopt(mDetail->mCurl, CURLOPT_FOLLOWLOCATION, 1);
+ rv = true;
+ break;
+
case HTTP_GET:
curl_easy_setopt(mDetail->mCurl, CURLOPT_HTTPGET, 1);
curl_easy_setopt(mDetail->mCurl, CURLOPT_FOLLOWLOCATION, 1);
diff --git a/linden/indra/llmessage/llurlrequest.h b/linden/indra/llmessage/llurlrequest.h
index f335316..4b12e71 100644
--- a/linden/indra/llmessage/llurlrequest.h
+++ b/linden/indra/llmessage/llurlrequest.h
@@ -69,6 +69,7 @@ public:
enum ERequestAction
{
INVALID,
+ HTTP_HEAD,
HTTP_GET,
HTTP_PUT,
HTTP_POST,
diff --git a/linden/indra/llprimitive/llprimitive.vcproj b/linden/indra/llprimitive/llprimitive.vcproj
index 60dc82e..b04d938 100644
--- a/linden/indra/llprimitive/llprimitive.vcproj
+++ b/linden/indra/llprimitive/llprimitive.vcproj
@@ -63,6 +63,7 @@
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"
@@ -105,6 +106,7 @@
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"
diff --git a/linden/indra/llprimitive/llprimitive_vc8.vcproj b/linden/indra/llprimitive/llprimitive_vc8.vcproj
index 5fbcbb1..a660023 100644
--- a/linden/indra/llprimitive/llprimitive_vc8.vcproj
+++ b/linden/indra/llprimitive/llprimitive_vc8.vcproj
@@ -4,6 +4,7 @@
Version="8.00"
Name="llprimitive"
ProjectGUID="{FCC4483C-5B84-4944-B91F-4589A219BC0B}"
+ RootNamespace="llprimitive"
Keyword="Win32Proj"
>
<Platforms>
@@ -108,6 +109,7 @@
/>
<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"
@@ -174,6 +176,7 @@
/>
<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"
diff --git a/linden/indra/llrender/llrender.vcproj b/linden/indra/llrender/llrender.vcproj
index 86ab1c8..ac9aa2e 100644
--- a/linden/indra/llrender/llrender.vcproj
+++ b/linden/indra/llrender/llrender.vcproj
@@ -63,6 +63,7 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
GlobalOptimizations="TRUE"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="TRUE"
@@ -110,6 +111,7 @@
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"
diff --git a/linden/indra/llrender/llrender_vc8.vcproj b/linden/indra/llrender/llrender_vc8.vcproj
index 4f6d276..eb7a9e3 100644
--- a/linden/indra/llrender/llrender_vc8.vcproj
+++ b/linden/indra/llrender/llrender_vc8.vcproj
@@ -4,6 +4,7 @@
Version="8.00"
Name="llrender"
ProjectGUID="{2ADE3C14-94C4-40BF-B033-70F3C954EE90}"
+ RootNamespace="llrender"
Keyword="Win32Proj"
>
<Platforms>
@@ -108,6 +109,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llimage;..\llwindow;..\..\libraries\i686-win32\include;..\..\libraries\include\"
@@ -176,6 +178,7 @@
/>
<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"
diff --git a/linden/indra/llui/llui.vcproj b/linden/indra/llui/llui.vcproj
index 37428d2..dad42c6 100644
--- a/linden/indra/llui/llui.vcproj
+++ b/linden/indra/llui/llui.vcproj
@@ -63,6 +63,7 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;"..\..\libraries\i686-win32\include";..\..\libraries\include\"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
RuntimeLibrary="0"
@@ -105,6 +106,7 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
Optimization="0"
AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;"..\..\libraries\i686-win32\include";..\..\libraries\include\"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
diff --git a/linden/indra/llui/llui_vc8.vcproj b/linden/indra/llui/llui_vc8.vcproj
index 096a755..71fdc83 100644
--- a/linden/indra/llui/llui_vc8.vcproj
+++ b/linden/indra/llui/llui_vc8.vcproj
@@ -4,6 +4,7 @@
Version="8.00"
Name="llui"
ProjectGUID="{DE55D666-6A3D-476C-937F-109269B83681}"
+ RootNamespace="llui"
Keyword="Win32Proj"
>
<Platforms>
@@ -108,6 +109,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\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"
@@ -174,6 +176,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
Optimization="0"
AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\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"
diff --git a/linden/indra/llvfs/llvfs.vcproj b/linden/indra/llvfs/llvfs.vcproj
index f5df235..85f5617 100644
--- a/linden/indra/llvfs/llvfs.vcproj
+++ b/linden/indra/llvfs/llvfs.vcproj
@@ -63,6 +63,7 @@
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"
@@ -105,6 +106,7 @@
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"
diff --git a/linden/indra/llvfs/llvfs_vc8.vcproj b/linden/indra/llvfs/llvfs_vc8.vcproj
index 7d4c0ae..1d48e4a 100644
--- a/linden/indra/llvfs/llvfs_vc8.vcproj
+++ b/linden/indra/llvfs/llvfs_vc8.vcproj
@@ -4,6 +4,7 @@
Version="8.00"
Name="llvfs"
ProjectGUID="{D37774F4-253D-4760-BF64-372A943224A1}"
+ RootNamespace="llvfs"
Keyword="Win32Proj"
>
<Platforms>
@@ -108,6 +109,7 @@
/>
<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"
@@ -174,6 +176,7 @@
/>
<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"
diff --git a/linden/indra/llwindow/llwindow.vcproj b/linden/indra/llwindow/llwindow.vcproj
index cb49783..7adecd6 100644
--- a/linden/indra/llwindow/llwindow.vcproj
+++ b/linden/indra/llwindow/llwindow.vcproj
@@ -63,6 +63,7 @@
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"
@@ -150,6 +151,7 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
Optimization="0"
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"
diff --git a/linden/indra/llwindow/llwindow_vc8.vcproj b/linden/indra/llwindow/llwindow_vc8.vcproj
index 019d6a9..b663fc8 100644
--- a/linden/indra/llwindow/llwindow_vc8.vcproj
+++ b/linden/indra/llwindow/llwindow_vc8.vcproj
@@ -108,6 +108,7 @@
/>
<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;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
TreatWChar_tAsBuiltInType="false"
@@ -238,6 +239,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
Optimization="0"
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;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
diff --git a/linden/indra/llxml/llxml.vcproj b/linden/indra/llxml/llxml.vcproj
index 2c1d266..be4ff97 100644
--- a/linden/indra/llxml/llxml.vcproj
+++ b/linden/indra/llxml/llxml.vcproj
@@ -63,6 +63,7 @@
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"
@@ -105,6 +106,7 @@
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"
diff --git a/linden/indra/llxml/llxml_vc8.vcproj b/linden/indra/llxml/llxml_vc8.vcproj
index 0b2a2b1..a049d41 100644
--- a/linden/indra/llxml/llxml_vc8.vcproj
+++ b/linden/indra/llxml/llxml_vc8.vcproj
@@ -4,6 +4,7 @@
Version="8.00"
Name="llxml"
ProjectGUID="{A5470DA6-0C3A-4602-B930-43DB25511A59}"
+ RootNamespace="llxml"
Keyword="Win32Proj"
>
<Platforms>
@@ -108,6 +109,7 @@
/>
<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"
@@ -174,6 +176,7 @@
/>
<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"
diff --git a/linden/indra/lscript/lscript_compile/lscript_compile.vcproj b/linden/indra/lscript/lscript_compile/lscript_compile.vcproj
index 59822f2..f2c75c5 100644
--- a/linden/indra/lscript/lscript_compile/lscript_compile.vcproj
+++ b/linden/indra/lscript/lscript_compile/lscript_compile.vcproj
@@ -64,6 +64,7 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;"..\..\..\libraries\i686-win32\include";..\..\..\libraries\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
RuntimeLibrary="0"
@@ -107,6 +108,7 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
Optimization="0"
AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;"..\..\..\libraries\i686-win32\include";..\..\..\libraries\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
diff --git a/linden/indra/lscript/lscript_compile/lscript_compile_vc8.vcproj b/linden/indra/lscript/lscript_compile/lscript_compile_vc8.vcproj
index 1427015..e8a531a 100644
--- a/linden/indra/lscript/lscript_compile/lscript_compile_vc8.vcproj
+++ b/linden/indra/lscript/lscript_compile/lscript_compile_vc8.vcproj
@@ -109,6 +109,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;"..\..\..\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"
@@ -175,6 +176,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
Optimization="0"
AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;"..\..\..\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"
diff --git a/linden/indra/lscript/lscript_execute/lscript_execute.vcproj b/linden/indra/lscript/lscript_execute/lscript_execute.vcproj
index c61ad89..682ee83 100644
--- a/linden/indra/lscript/lscript_execute/lscript_execute.vcproj
+++ b/linden/indra/lscript/lscript_execute/lscript_execute.vcproj
@@ -63,6 +63,7 @@
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"
@@ -105,6 +106,7 @@
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"
diff --git a/linden/indra/lscript/lscript_execute/lscript_execute_vc8.vcproj b/linden/indra/lscript/lscript_execute/lscript_execute_vc8.vcproj
index 0a987c8..2314e6a 100644
--- a/linden/indra/lscript/lscript_execute/lscript_execute_vc8.vcproj
+++ b/linden/indra/lscript/lscript_execute/lscript_execute_vc8.vcproj
@@ -4,6 +4,7 @@
Version="8.00"
Name="lscript_execute"
ProjectGUID="{F882263E-4F2A-43D9-A45A-FA4C8EC66552}"
+ RootNamespace="lscript_execute"
Keyword="Win32Proj"
>
<Platforms>
@@ -108,6 +109,7 @@
/>
<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"
@@ -174,6 +176,7 @@
/>
<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"
diff --git a/linden/indra/lscript/lscript_library/lscript_library.vcproj b/linden/indra/lscript/lscript_library/lscript_library.vcproj
index 1a340da..1a42773 100644
--- a/linden/indra/lscript/lscript_library/lscript_library.vcproj
+++ b/linden/indra/lscript/lscript_library/lscript_library.vcproj
@@ -63,6 +63,7 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;"..\..\..\libraries\i686-win32";..\..\..\libraries\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
RuntimeLibrary="0"
@@ -105,6 +106,7 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
Optimization="0"
AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;"..\..\..\libraries\i686-win32";..\..\..\libraries\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
diff --git a/linden/indra/lscript/lscript_library/lscript_library_vc8.vcproj b/linden/indra/lscript/lscript_library/lscript_library_vc8.vcproj
index ee92752..371f880 100644
--- a/linden/indra/lscript/lscript_library/lscript_library_vc8.vcproj
+++ b/linden/indra/lscript/lscript_library/lscript_library_vc8.vcproj
@@ -4,6 +4,7 @@
Version="8.00"
Name="lscript_library"
ProjectGUID="{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}"
+ RootNamespace="lscript_library"
Keyword="Win32Proj"
>
<Platforms>
@@ -108,6 +109,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;"..\..\..\libraries\i686-win32";..\..\..\libraries\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
RuntimeLibrary="0"
@@ -174,6 +176,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
Optimization="0"
AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;"..\..\..\libraries\i686-win32";..\..\..\libraries\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
diff --git a/linden/indra/newview/CrashReporter.nib/classes.nib b/linden/indra/newview/CrashReporter.nib/classes.nib
index ea58db1..c4b887e 100644
--- a/linden/indra/newview/CrashReporter.nib/classes.nib
+++ b/linden/indra/newview/CrashReporter.nib/classes.nib
@@ -1,4 +1,8 @@
-{
-IBClasses = ();
-IBVersion = 1;
-}
+<?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>
diff --git a/linden/indra/newview/CrashReporter.nib/info.nib b/linden/indra/newview/CrashReporter.nib/info.nib
index 8eba931..b541744 100644
--- a/linden/indra/newview/CrashReporter.nib/info.nib
+++ b/linden/indra/newview/CrashReporter.nib/info.nib
@@ -1,17 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//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>446.1</string>
+ <string>629</string>
+ <key>IBLastKnownRelativeProjectPath</key>
+ <string>../macview.xcodeproj</string>
+ <key>IBOldestOS</key>
+ <integer>5</integer>
<key>IBOpenObjects</key>
<array>
- <integer>166</integer>
+ <integer>193</integer>
</array>
<key>IBSystem Version</key>
- <string>8R2218</string>
+ <string>9B18</string>
<key>targetFramework</key>
<string>IBCarbonFramework</string>
</dict>
diff --git a/linden/indra/newview/CrashReporter.nib/objects.xib b/linden/indra/newview/CrashReporter.nib/objects.xib
index f62b8d5..1099f56 100644
--- a/linden/indra/newview/CrashReporter.nib/objects.xib
+++ b/linden/indra/newview/CrashReporter.nib/objects.xib
@@ -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. This crash reporter collects information about your computer's hardware configuration, operating system, and some Second Life logs, all of which are used for debugging purposes only. 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! This report is NOT read by Customer Support. If you have billing or other questions, please go to: http://www.secondlife.com/support/ If you don't wish to send Linden Lab a crash report, press Cancel. </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'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. This crash reporter collects information about your computer's hardware configuration, operating system, and some Second Life logs, all of which are used for debugging purposes only. 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! This report is NOT read by Customer Support. If you have billing or other questions, please go to: http://www.secondlife.com/support/ If you don't wish to send Linden Lab a crash report, press Cancel. </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'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="167"/>
- <reference idRef="181"/>
- <reference idRef="182"/>
- <reference idRef="183"/>
- <reference idRef="185"/>
<reference idRef="193"/>
+ <reference idRef="185"/>
+ <reference idRef="182"/>
</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,5 +64,6 @@
<string>File's Owner</string>
<reference idRef="1"/>
</dictionary>
+ <string name="targetFramework">IBCarbonFramework</string>
<unsigned_int name="nextObjectID">194</unsigned_int>
</object>
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 85f7e25..38cbbde 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
/* Localized versions of Info.plist keys */
CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.18.6.0";
-CFBundleGetInfoString = "Second Life version 1.18.6.0, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.18.6.1";
+CFBundleGetInfoString = "Second Life version 1.18.6.1, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist
index 59822a1..62f1665 100644
--- a/linden/indra/newview/Info-SecondLife.plist
+++ b/linden/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.18.6.0</string>
+ <string>1.18.6.1</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>
diff --git a/linden/indra/newview/app_settings/colors_base.xml b/linden/indra/newview/app_settings/colors_base.xml
index 5a9261b..5902a7d 100644
--- a/linden/indra/newview/app_settings/colors_base.xml
+++ b/linden/indra/newview/app_settings/colors_base.xml
@@ -169,4 +169,5 @@
<FilterBackgroundColor value="0, 0, 20, 255"/>
<FilterTextColor value="255, 200, 70, 255"/>
+<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>
</settings>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 45eaaa9..e95180c 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1003,7 +1003,7 @@ bool LLAppViewer::init()
writeSystemInfo();
// Build a string representing the current version number.
- gCurrentVersion = llformat("%d.%d.%d", LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH );
+ gCurrentVersion = llformat("%s %d.%d.%d.%d", gChannelName.c_str(), LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VERSION_BUILD );
//
// Load the feature tables
diff --git a/linden/indra/newview/llcontroldef.cpp b/linden/indra/newview/llcontroldef.cpp
index 66b5b92..45b8be3 100644
--- a/linden/indra/newview/llcontroldef.cpp
+++ b/linden/indra/newview/llcontroldef.cpp
@@ -188,6 +188,7 @@ void declare_settings()
gSavedSettings.declareBOOL("ShowEmptyFoldersWhenSearching", FALSE, "Shows folders that do not have any visible contents when applying a filter to inventory");
gSavedSettings.declareS32("FilterItemsPerFrame", 500, "Maximum number of inventory items to match against search filter every frame (lower to increase framerate while searching, higher to improve search speed)");
gSavedSettings.declareBOOL("DebugInventoryFilters", FALSE, "Turn on debugging display for inventory filtering");
+ gSavedSettings.declareF32("FolderLoadingMessageWaitTime", 0.5f, "Seconds to wait before showing the LOADING... text in folder views");
//------------------------------------------------------------------------
// Status bar
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index eb9addc..7d309a0 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -108,6 +108,7 @@ LLColor4 LLFolderViewItem::sHighlightBgColor;
LLColor4 LLFolderViewItem::sHighlightFgColor;
LLColor4 LLFolderViewItem::sFilterBGColor;
LLColor4 LLFolderViewItem::sFilterTextColor;
+LLColor4 LLFolderViewItem::sLoadingMessageTextColor;
// Default constructor
LLFolderViewItem::LLFolderViewItem( const LLString& name, LLViewerImage* icon,
@@ -132,7 +133,8 @@ LLFolderViewItem::LLFolderViewItem( const LLString& name, LLViewerImage* icon,
mStringMatchOffset(LLString::npos),
mControlLabelRotation(0.f),
mRoot( root ),
- mDragAndDropTarget(FALSE)
+ mDragAndDropTarget(FALSE),
+ mIsLoading(FALSE)
{
setIcon(icon);
if( !LLFolderViewItem::sFont )
@@ -151,6 +153,7 @@ LLFolderViewItem::LLFolderViewItem( const LLString& name, LLViewerImage* icon,
LLFolderViewItem::sHighlightFgColor = gColors.getColor( "MenuItemHighlightFgColor" );
LLFolderViewItem::sFilterBGColor = gColors.getColor( "FilterBackgroundColor" );
LLFolderViewItem::sFilterTextColor = gColors.getColor( "FilterTextColor" );
+ LLFolderViewItem::sLoadingMessageTextColor = gColors.getColor( "FolderViewLoadingMessageTextColor" );
mArrowImage = gImageList.getImage(LLUUID(gViewerArt.getString("folder_arrow.tga")), MIPMAP_FALSE, TRUE);
mBoxImage = gImageList.getImage(LLUUID(gViewerArt.getString("rounded_square.tga")), MIPMAP_FALSE, TRUE);
@@ -933,6 +936,14 @@ void LLFolderViewItem::draw()
text_left = right_x;
}
+
+ if ( mIsLoading && mTimeSinceRequestStart.getElapsedTimeF32() >= gSavedSettings.getF32("FolderLoadingMessageWaitTime") )
+ {
+ sFont->renderUTF8( "Loading... ", 0, text_left, y, sLoadingMessageTextColor,
+ LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, S32_MAX, S32_MAX, &right_x, FALSE);
+ text_left = right_x;
+ }
+
sFont->renderUTF8( mLabel, 0, text_left, y, color,
LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle,
S32_MAX, S32_MAX, &right_x, FALSE );
@@ -2197,6 +2208,24 @@ void LLFolderViewFolder::draw()
mControlLabelRotation = lerp(mControlLabelRotation, 0.f, LLCriticalDamp::getInterpolant(0.025f));
}
+ bool possibly_has_children = false;
+ bool up_to_date = mListener && mListener->isUpToDate();
+ if(!up_to_date && mListener && mListener->hasChildren()) // we know we have children but haven't fetched them (doesn't obey filter)
+ {
+ possibly_has_children = true;
+ }
+
+
+ BOOL loading = ( mIsOpen && possibly_has_children && !up_to_date );
+
+ if ( loading && !mIsLoading )
+ {
+ // Measure how long we've been in the loading state
+ mTimeSinceRequestStart.reset();
+ }
+
+ mIsLoading = loading;
+
LLFolderViewItem::draw();
// draw children if root folder, or any other folder that is open or animating to closed state
diff --git a/linden/indra/newview/llfolderview.h b/linden/indra/newview/llfolderview.h
index dd0dd21..466aac4 100644
--- a/linden/indra/newview/llfolderview.h
+++ b/linden/indra/newview/llfolderview.h
@@ -323,6 +323,7 @@ protected:
static LLColor4 sHighlightFgColor;
static LLColor4 sFilterBGColor;
static LLColor4 sFilterTextColor;
+ static LLColor4 sLoadingMessageTextColor;
LLString mLabel;
LLString mSearchableLabel;
@@ -349,6 +350,8 @@ protected:
BOOL mDragAndDropTarget;
LLPointer<LLViewerImage> mArrowImage;
LLPointer<LLViewerImage> mBoxImage;
+ BOOL mIsLoading;
+ LLTimer mTimeSinceRequestStart;
// This function clears the currently selected item, and records
// the specified selected item appropriately for display and use
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 5b43497..18b8462 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -1876,16 +1876,13 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
payment_text = "NoPaymentInfoOnFile";
}
args["[PAYMENTINFO]"] = self->mPanelSecondLife->childGetValue(payment_text).asString();
- LLString age_text = "NotAgeVerified";
- if(age_verified)
- {
- age_text = "AgeVerified";
- }
- args["[PAYMENTINFO]"] += self->mPanelSecondLife->childGetValue(age_text).asString();
+ LLString age_text = age_verified ? "AgeVerified" : "NotAgeVerified";
+ args["[AGEVERIFICATION]"] = self->mPanelSecondLife->childGetValue(age_text).asString();
}
else
{
args["[PAYMENTINFO]"] = " ";
+ args["[AGEVERIFICATION]"] = " ";
}
LLString::format(caption_text, args);
}
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 3e64bba..c7f10fd 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -149,6 +149,13 @@ void LLLoginHandler::parse(const LLSD& queryMap)
gGridChoice = GRID_INFO_UMA;
}
+#if !LL_RELEASE_FOR_DOWNLOAD
+ if (gGridChoice > GRID_INFO_NONE && gGridChoice < GRID_INFO_LOCAL)
+ {
+ gSavedSettings.setS32("ServerChoice", gGridChoice);
+ }
+#endif
+
snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName); /* Flawfinder: ignore */
LLAppViewer::instance()->resetURIs();
@@ -304,6 +311,9 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
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);
@@ -329,7 +339,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
// kick off a request to grab the url manually
gResponsePtr = LLIamHereLogin::build( this );
- LLHTTPClient::get( childGetValue( "real_url" ).asString(), gResponsePtr );
+ LLHTTPClient::head( childGetValue( "real_url" ).asString(), gResponsePtr );
};
#else
mHtmlAvailable = FALSE;
@@ -351,20 +361,27 @@ void LLPanelLogin::setSiteIsAlive( bool alive )
// mark as available
mHtmlAvailable = TRUE;
- };
+ }
}
else
// the site is not available (missing page, server down, other badness)
{
if ( web_browser )
{
- // hide browser control (revealing default one)
- web_browser->setVisible( FALSE );
+ // painfully build the path to the loading screen
+ std::string loading_path( gDirUtilp->getExpandedFilename( LL_PATH_SKINS, "" ) );
+ loading_path.append( gDirUtilp->getDirDelimiter() );
+ loading_path.append( "html" );
+ loading_path.append( gDirUtilp->getDirDelimiter() );
+ loading_path.append( "loading-error" );
+ loading_path.append( gDirUtilp->getDirDelimiter() );
+ loading_path.append( "index.html" );
+ web_browser->navigateTo( loading_path.c_str() );
- // mark as unavailable
- mHtmlAvailable = FALSE;
- };
- };
+ // mark as available
+ mHtmlAvailable = TRUE;
+ }
+ }
#else
mHtmlAvailable = FALSE;
#endif
@@ -655,6 +672,22 @@ void LLPanelLogin::loadLoginPage()
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
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index 191e88c..f2a58b7 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -39,6 +39,7 @@
#include "llviewerimage.h"
#include "llstring.h"
#include "llmd5.h"
+#include "llwebbrowserctrl.h"
class LLTextBox;
class LLLineEditor;
@@ -64,6 +65,9 @@ extern LLLoginHandler gLoginHandler;
class LLPanelLogin
: public LLPanel
+#if LL_LIBXUL_ENABLED
+ , public LLWebBrowserCtrlObserver
+#endif
{
public:
LLPanelLogin(const LLRect &rect, BOOL show_server,
@@ -89,6 +93,11 @@ public:
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;
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 3c29cfd..9b3808f 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -5825,7 +5825,8 @@ bool LLObjectSelection::applyToTEs(LLSelectedTEFunctor* func, bool firstonly)
iterator nextiter = iter++;
LLSelectNode* node = *nextiter;
LLViewerObject* object = (*nextiter)->getObject();
- for (S32 te = 0; te < object->getNumTEs(); ++te)
+ S32 num_tes = llmin((S32)object->getNumTEs(), (S32)object->getNumFaces()); // avatars have TEs but no faces
+ for (S32 te = 0; te < num_tes; ++te)
{
if (node->isTESelected(te))
{
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index a6fb7fa..22985b0 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -1072,7 +1072,7 @@ void init_client_menu(LLMenuGL* menu)
&menu_check_control,
(void*)"ShowConsoleWindow"));
- if(gQAMode && !gInProductionGrid)
+ if(gQAMode)// && !gInProductionGrid)
{
LLMenuGL* sub = NULL;
sub = new LLMenuGL("Debugging");
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 2011275..37e851c 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -279,11 +279,6 @@ void process_logout_reply(LLMessageSystem* msg, void**)
llinfos << "process_logout_reply item not found: " << item_id << llendl;
}
}
- if(!parents.empty())
- {
- gInventory.accountForUpdate(parents);
- gInventory.notifyObservers();
- }
LLAppViewer::instance()->forceQuit();
}
@@ -1335,7 +1330,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
S32 binary_bucket_size;
LLChat chat;
- //*TODO:translate - need to fix the full name to first/last (maybe)
+ // *TODO:translate - need to fix the full name to first/last (maybe)
msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, from_id);
msg->getBOOLFast(_PREHASH_MessageBlock, _PREHASH_FromGroup, from_group);
msg->getUUIDFast(_PREHASH_MessageBlock, _PREHASH_ToAgentID, to_id);
@@ -1872,6 +1867,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
case IM_GOTO_URL:
{
+ // n.b. this is for URLs sent by the system, not for
+ // URLs sent by scripts (i.e. llLoadURL)
if (binary_bucket_size <= 0)
{
llwarns << "bad binary_bucket_size: "
@@ -5091,7 +5088,7 @@ void callback_load_url_name(const LLUUID& id, const char* first, const char* las
owner_name += last;
}
- // TODO: Talk to james about using an id instead of a name for this.
+ // For legacy name-only mutes.
if (gMuteListp->isMuted(LLUUID::null, owner_name))
{
delete infop;
@@ -5126,8 +5123,12 @@ void process_load_url(LLMessageSystem* msg, void**)
// URL is safety checked in load_url above
// Check if object or owner is muted
- if (gMuteListp->isMuted(infop->mObjectID, infop->mObjectName))
+ if (gMuteListp &&
+ (gMuteListp->isMuted(infop->mObjectID, infop->mObjectName) ||
+ gMuteListp->isMuted(infop->mOwnerID))
+ )
{
+ llinfos<<"Ignoring load_url from muted object/owner."<<llendl;
delete infop;
infop = NULL;
return;
diff --git a/linden/indra/newview/llwebbrowserctrl.cpp b/linden/indra/newview/llwebbrowserctrl.cpp
index afd27bf..e819f21 100644
--- a/linden/indra/newview/llwebbrowserctrl.cpp
+++ b/linden/indra/newview/llwebbrowserctrl.cpp
@@ -217,6 +217,21 @@ BOOL LLWebBrowserCtrl::handleMouseDown( S32 x, S32 y, MASK mask )
////////////////////////////////////////////////////////////////////////////////
//
+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 );
diff --git a/linden/indra/newview/llwebbrowserctrl.h b/linden/indra/newview/llwebbrowserctrl.h
index 8b19a23..dedb8cf 100644
--- a/linden/indra/newview/llwebbrowserctrl.h
+++ b/linden/indra/newview/llwebbrowserctrl.h
@@ -181,6 +181,7 @@ class LLWebBrowserCtrl :
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
diff --git a/linden/indra/newview/macview.xcodeproj/project.pbxproj b/linden/indra/newview/macview.xcodeproj/project.pbxproj
index 2d54757..3e03152 100644
--- a/linden/indra/newview/macview.xcodeproj/project.pbxproj
+++ b/linden/indra/newview/macview.xcodeproj/project.pbxproj
@@ -5289,6 +5289,19 @@
"$(SRCROOT)/../../libraries/universal-darwin/lib_release",
"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
);
+ OTHER_CFLAGS = (
+ "-DLL_DARWIN=1",
+ "-DLL_RELEASE=1",
+ "-DLL_RELEASE_FOR_DOWNLOAD=1",
+ "-DLL_SEND_CRASH_REPORTS=1",
+ "-DNDEBUG",
+ "-fconstant-cfstrings",
+ );
+ OTHER_CPLUSPLUSFLAGS = (
+ "$(OTHER_CFLAGS)",
+ "-ffor-scope",
+ "-Wno-reorder",
+ );
OTHER_LDFLAGS = "-Wl,-search_paths_first";
PRODUCT_NAME = "Second Life";
SEPARATE_STRIP = YES;
@@ -5557,6 +5570,14 @@
);
LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/vivox-runtime/universal-darwin\"";
LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/build/Universal\"";
+ OTHER_CFLAGS = (
+ "-DLL_DARWIN=1",
+ "-DLL_RELEASE=1",
+ "-DLL_RELEASE_FOR_DOWNLOAD=1",
+ "-DLL_SEND_CRASH_REPORTS=1",
+ "-DNDEBUG",
+ "-fconstant-cfstrings",
+ );
OTHER_LDFLAGS = (
"-lllmozlib",
"-Wl,-search_paths_first",
diff --git a/linden/indra/newview/newview.vcproj b/linden/indra/newview/newview.vcproj
index 941c6c0..a2cb32d 100644
--- a/linden/indra/newview/newview.vcproj
+++ b/linden/indra/newview/newview.vcproj
@@ -81,6 +81,7 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
GlobalOptimizations="FALSE"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="TRUE"
@@ -149,8 +150,9 @@
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;"..\..\libraries\i686-win32\include";..\..\libraries\include;..\..\libraries\include\zlib;"..\..\libraries\i686-win32\include\quicktime";..\..\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"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE;LL_RELEASE_FOR_DOWNLOAD;LL_SEND_CRASH_REPORTS=1;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
RuntimeLibrary="0"
StructMemberAlignment="0"
UsePrecompiledHeader="3"
@@ -215,6 +217,7 @@
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;"..\..\libraries\i686-win32\include";..\..\libraries\include;..\..\libraries\include\zlib;"..\..\libraries\i686-win32\include\quicktime";..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
diff --git a/linden/indra/newview/newview_vc8.vcproj b/linden/indra/newview/newview_vc8.vcproj
index 362462f..1a12404 100644
--- a/linden/indra/newview/newview_vc8.vcproj
+++ b/linden/indra/newview/newview_vc8.vcproj
@@ -137,6 +137,7 @@
/>
<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;"..\..\libraries\i686-win32\include";..\..\libraries\include\;"..\..\libraries\i686-win32\include\quicktime";..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
@@ -235,6 +236,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;"..\..\libraries\i686-win32\include";..\..\libraries\include\;"..\..\libraries\i686-win32\include\quicktime";..\..\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"
@@ -259,7 +261,7 @@
<Tool
Name="VCLinkerTool"
LinkLibraryDependencies="false"
- 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"
+ 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"
OutputFile="$(ConfigurationName)/SecondLife.exe"
LinkIncremental="0"
AdditionalLibraryDirectories=""../lib_release/i686-win32";"../../libraries/i686-win32/lib_release""
@@ -325,6 +327,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/Oy-"
Optimization="0"
AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;"..\..\libraries\i686-win32\include";..\..\libraries\include\;"..\..\libraries\i686-win32\include\quicktime";..\..\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"
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index 6c581c5..a217a6b 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -1,3 +1,17 @@
+Release Notes for Second Life 1.18.6(1) December 12, 2007
+=====================================
+Changes:
+* Change crash logger "Remember this choice" function to default to on
+* Connect button now has focus on login screen
+* Inventory folder loading state now more clearly indicated
+
+Fixes:
+* VWR-3558: llLoadURL cannot be muted
+* VWR-3428: Checking a users profile while editing a linked set causes viewer crash
+* Viewer channel and version numbers reported incorrectly during login
+* Inventory cache version number incorrectly incremented, leading to perceved loss
+* Age verification status hard to read in the profile field
+
Release Notes for Second Life 1.18.6(0) December 5, 2007
=====================================
Changes:
diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc
index 05081a9..f1836d6 100644
--- a/linden/indra/newview/res/newViewRes.rc
+++ b/linden/indra/newview/res/newViewRes.rc
@@ -228,8 +228,8 @@ TOOLPIPETTE CURSOR "toolpipette.cur"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,18,6,0
- PRODUCTVERSION 1,18,6,0
+ FILEVERSION 1,18,6,1
+ PRODUCTVERSION 1,18,6,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -246,12 +246,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Linden Lab"
VALUE "FileDescription", "Second Life"
- VALUE "FileVersion", "1.18.6.0"
+ VALUE "FileVersion", "1.18.6.1"
VALUE "InternalName", "Second Life"
VALUE "LegalCopyright", "Copyright � 2001-2007, Linden Research, Inc."
VALUE "OriginalFilename", "SecondLife.exe"
VALUE "ProductName", "Second Life"
- VALUE "ProductVersion", "1.18.6.0"
+ VALUE "ProductVersion", "1.18.6.1"
END
END
BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/skins/xui/en-us/menu_login.xml b/linden/indra/newview/skins/xui/en-us/menu_login.xml
index 6533f90..02addf3 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_login.xml
@@ -5,7 +5,7 @@
width="802">
<menu bottom="273" drop_shadow="true" enabled="true" height="263"
hidden="false" label="File" left="0" mouse_opaque="false" name="File"
- opaque="true" tear_off="true" create_jump_keys="true" width="243">
+ opaque="true" tear_off="false" create_jump_keys="true" width="243">
<menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Quit" left="0"
mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
<on_click function="File.Quit" userdata="" />
@@ -13,7 +13,7 @@
</menu>
<menu bottom="97" drop_shadow="true" enabled="true" height="439"
hidden="false" label="Edit" left="38" mouse_opaque="false" name="Edit"
- opaque="true" tear_off="true" create_jump_keys="true" width="153">
+ opaque="true" tear_off="false" create_jump_keys="true" width="153">
<menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Preferences..."
left="0" mouse_opaque="true" name="Preferences..." shortcut="control|P"
width="153">
@@ -22,7 +22,7 @@
</menu>
<menu bottom="219" drop_shadow="true" enabled="true" height="317"
hidden="false" label="Help" left="80" mouse_opaque="false" name="Help"
- opaque="true" tear_off="true" create_jump_keys="true" width="166">
+ opaque="true" tear_off="falsoe" create_jump_keys="true" width="166">
<menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Second Life Help"
left="0" mouse_opaque="true" name="Second Life Help" shortcut="F1"
width="166">
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
index c5c42b4..a51b8e7 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
@@ -6,6 +6,7 @@
<text hidden="true" name="CaptionTextAcctInfo">
[ACCTTYPE]
[PAYMENTINFO]
+[AGEVERIFICATION]
</text>
<text hidden="true" name="AcctTypeResident">
Resident
@@ -29,10 +30,10 @@
No Payment Info On File
</text>
<text hidden="true" name="AgeVerified">
- , Age-verified
+ Age-verified
</text>
<text hidden="true" name="NotAgeVerified">
- , Not Age-verified
+ Not Age-verified
</text>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top"
@@ -68,12 +69,13 @@
mouse_opaque="true" name="label2" v_pad="0" width="121">
Account:
</text>
- <view_border bevel_style="in" bottom_delta="-32" follows="left|top" height="32" left="279"
+ <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="48" left="279"
mouse_opaque="false" name="acct_border" width="121" />
<text bg_color="0, 0, 0, 0" bg_visible="false" border_drop_shadow_visible="false"
border_visible="true" bottom_delta="0" drop_shadow_visible="true"
- follows="left|top" font="SansSerifSmall" height="32" left="279"
+ follows="left|top" font="SansSerifSmall" height="48" left="279"
mouse_opaque="false" name="acct" text_color="1, 1, 1, 1" width="121" />
+
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
diff --git a/linden/indra/test/llhttpclient_tut.cpp b/linden/indra/test/llhttpclient_tut.cpp
index b29caf9..21a0771 100644
--- a/linden/indra/test/llhttpclient_tut.cpp
+++ b/linden/indra/test/llhttpclient_tut.cpp
@@ -341,6 +341,14 @@ namespace tut
ensure_equals("echoed result matches", body.size(), expected.size());
}
+ template<> template<>
+ void HTTPClientTestObject::test<8>()
+ {
+ LLHTTPClient::head("http://www.secondlife.com/", newResult());
+ runThePump();
+ ensureStatusOK();
+ ensure("result object wasn't destroyed", mResultDeleted);
+ }
}
#endif // !LL_WINDOWS
diff --git a/linden/indra/win_crash_logger/llcrashloggerwindows.cpp b/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
index 5a25c17..ab8f693 100644
--- a/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
+++ b/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
@@ -319,7 +319,7 @@ bool LLCrashLoggerWindows::mainLoop()
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);
diff --git a/linden/libraries/include/llmozlib.h b/linden/libraries/include/llmozlib.h
index ad850e5..0a0ad85 100644
--- a/linden/libraries/include/llmozlib.h
+++ b/linden/libraries/include/llmozlib.h
@@ -158,6 +158,10 @@ class LLMozLib
// 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 );
--
cgit v1.1