diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index fedb43235..c4351e8c8 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -62,7 +62,8 @@ if (WINDOWS)
   
   # Are we using the crummy Visual Studio KDU build workaround?
   if (NOT VS_DISABLE_FATAL_WARNINGS)
-    add_definitions(/WX)
+	#ESTOY USANDO EL INTERNET
+    #add_definitions(/WX)
   endif (NOT VS_DISABLE_FATAL_WARNINGS)
 endif (WINDOWS)
 
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index efe9ad74d..a84a09f5d 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -15,18 +15,8 @@ else (STANDALONE)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 
   if (WINDOWS)
-    set(BOOST_VERSION 1_39)
-    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})
-      set(BOOST_REGEX_LIBRARY
-          optimized libboost_regex-vc71-mt-s-${BOOST_VERSION}
-          debug libboost_regex-vc71-mt-sgd-${BOOST_VERSION})
-      set(BOOST_SIGNALS_LIBRARY 
-          optimized libboost_signals-vc71-mt-s-${BOOST_VERSION}
-          debug libboost_signals-vc71-mt-sgd-${BOOST_VERSION})
-    else (MSVC71)
+    set(BOOST_VERSION 1_36)
+    if (MSVC80)
       set(BOOST_PROGRAM_OPTIONS_LIBRARY 
           optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
           debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
@@ -36,7 +26,17 @@ else (STANDALONE)
       set(BOOST_SIGNALS_LIBRARY 
           optimized libboost_signals-vc80-mt-${BOOST_VERSION}
           debug libboost_signals-vc80-mt-gd-${BOOST_VERSION})
-    endif (MSVC71)
+    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 (MSVC80)
   elseif (DARWIN)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
     set(BOOST_REGEX_LIBRARY boost_regex-mt)
diff --git a/install.xml b/install.xml
index 7ea68e17d..cc7013ab5 100644
--- a/install.xml
+++ b/install.xml
@@ -194,6 +194,7 @@
         <key>license</key>
         <string>sleepycat</string>
       </map>
+      <!-- Use some of the boost libraries from imprudence because of FUCKING WINDOWS 98 (should probably host this somewhere else in the future) -->
       <key>boost</key>
       <map>
         <key>copyright</key>
@@ -207,23 +208,23 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>bb8552f22769da81593f7d47a51d83d8</string>
+            <string>279834a12a0ed4531fd602594eac8509</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-darwin-20100226.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.32.0-darwin-20080812.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>d58ac1a8396ac983b67cc3e3541457e3</string>
+            <string>15149b8140d06f9bd1b8672b958c6915</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20100222a.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/boost-1.36.0-linux-20091128.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>ed53511382d0fd9fec59a9f6544d9672</string>
+            <string>094acc8173faca882ed9532e868d767f</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20091029.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/boost-1.36.0-windows-20091124.tar.bz2</uri>
           </map>
         </map>
       </map>