5 files changed, 29 insertions, 13 deletions

diff --git a/linden/indra/cmake/Boost.cmake b/linden/indra/cmake/Boost.cmake
index 0578ae9..50b8eff 100644
--- a/linden/indra/cmake/Boost.cmake
+++ b/linden/indra/cmake/Boost.cmake
@@ -15,18 +15,18 @@ else (STANDALONE)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 
   if (WINDOWS)
-    set(BOOST_VERSION 1_34_1)
+    set(BOOST_VERSION 1_36)
     if (MSVC71)
       set(BOOST_PROGRAM_OPTIONS_LIBRARY 
-          optimized libboost_program_options-vc71-mt-s-${BOOST_VERSION}
-          debug libboost_program_options-vc71-mt-sgd-${BOOST_VERSION})
+          optimized libboost_program_options-vc71-mt-${BOOST_VERSION}
+          debug libboost_program_options-vc71-mt-gd-${BOOST_VERSION})
       set(BOOST_REGEX_LIBRARY
-          optimized libboost_regex-vc71-mt-s-${BOOST_VERSION}
-          debug libboost_regex-vc71-mt-sgd-${BOOST_VERSION})
+          optimized libboost_regex-vc71-mt-${BOOST_VERSION}
+          debug libboost_regex-vc71-mt-gd-${BOOST_VERSION})
       set(BOOST_SIGNALS_LIBRARY 
-          optimized libboost_signals-vc71-mt-s-${BOOST_VERSION}
-          debug libboost_signals-vc71-mt-sgd-${BOOST_VERSION})
-    else (MSVC71)
+          optimized libboost_signals-vc71-mt-${BOOST_VERSION}
+          debug libboost_signals-vc71-mt-gd-${BOOST_VERSION})
+    elseif (MSVC80)
       set(BOOST_PROGRAM_OPTIONS_LIBRARY 
           optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
           debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
@@ -36,6 +36,16 @@ else (STANDALONE)
       set(BOOST_SIGNALS_LIBRARY 
           optimized libboost_signals-vc80-mt-${BOOST_VERSION}
           debug libboost_signals-vc80-mt-gd-${BOOST_VERSION})
+    elseif (MSVC90)
+      set(BOOST_PROGRAM_OPTIONS_LIBRARY 
+          optimized libboost_program_options-vc90-mt-${BOOST_VERSION}
+          debug libboost_program_options-vc90-mt-gd-${BOOST_VERSION})
+      set(BOOST_REGEX_LIBRARY
+          optimized libboost_regex-vc90-mt-${BOOST_VERSION}
+          debug libboost_regex-vc90-mt-gd-${BOOST_VERSION})
+      set(BOOST_SIGNALS_LIBRARY 
+          optimized libboost_signals-vc90-mt-${BOOST_VERSION}
+          debug libboost_signals-vc90-mt-gd-${BOOST_VERSION})
     endif (MSVC71)
   elseif (DARWIN)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
diff --git a/linden/indra/llcommon/linden_common.h b/linden/indra/llcommon/linden_common.h
index f9d5877..25dd629 100644
--- a/linden/indra/llcommon/linden_common.h
+++ b/linden/indra/llcommon/linden_common.h
@@ -75,6 +75,7 @@
 #pragma warning (disable : 4396) // the inline specifier cannot be used when a friend declaration refers to a specialization of a function template
 #pragma warning (disable : 4512) // assignment operator could not be generated
 #pragma warning (disable : 4706) // assignment within conditional (even if((x = y)) )
+#pragma warning (disable : 4265) // boost 1.36.0, non-virtual destructor in boost::exception_detail::*
 #endif  //      LL_WINDOWS
 
 // Linden only libs in alpha-order other than stdtypes.h
diff --git a/linden/indra/llmath/llmath.h b/linden/indra/llmath/llmath.h
index 66451b1..9f8e539 100644
--- a/linden/indra/llmath/llmath.h
+++ b/linden/indra/llmath/llmath.h
@@ -60,9 +60,7 @@
 #endif
 
 // Single Precision Floating Point Routines
-#ifndef fsqrtf
-#define fsqrtf(x)               ((F32)sqrt((F64)(x)))
-#endif
+#if _MSC_VER < 1400
 #ifndef sqrtf
 #define sqrtf(x)                ((F32)sqrt((F64)(x)))
 #endif
@@ -83,6 +81,11 @@
 #ifndef powf
 #define powf(x,y) ((F32)pow((F64)(x),(F64)(y)))
 #endif
+#endif
+
+#ifndef fsqrtf
+#define fsqrtf(x)               sqrtf(x)
+#endif
 
 const F32       GRAVITY                 = -9.8f;
 
diff --git a/linden/indra/newview/llfloaterhtmlhelp.cpp b/linden/indra/newview/llfloaterhtmlhelp.cpp
index 8de489a..607a245 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.cpp
+++ b/linden/indra/newview/llfloaterhtmlhelp.cpp
@@ -307,6 +307,8 @@ public:
         virtual void draw();
         
         static void show(std::string url, std::string title);
+
+private:
         static void onClickBack( void* data );
         static void onClickHome( void* data );
         static void onClickForward( void* data );
@@ -321,7 +323,6 @@ public:
 
         static bool onClickF1HelpLoadURL(const LLSD& notification, const LLSD& response);
 
-protected:
         LLWebBrowserCtrl* mWebBrowser;
         static LLFloaterHtmlHelp* sInstance;
         LLButton* mBackButton;
diff --git a/linden/indra/newview/llfloaterhtmlhelp.h b/linden/indra/newview/llfloaterhtmlhelp.h
index 5b09634..fa04f06 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.h
+++ b/linden/indra/newview/llfloaterhtmlhelp.h
@@ -69,6 +69,8 @@ public:
 
         static void     toggle();
         static void     helpF1();
+
+private:
         static void onEnterAddress(LLUICtrl* ctrl, void* user_data);
         static void onClickRefresh(void* user_data);
         static void onClickBack(void* user_data);
@@ -81,7 +83,6 @@ public:
         static void onClickSetHome(void* user_data);
         static bool onClickF1HelpLoadURL(const LLSD& notification, const LLSD& response);
 
-private:
         LLWebBrowserCtrl* mBrowser;
         LLComboBox* mAddressCombo;
         std::string mCurrentURL;