Merge branch 'next' of git://github.com/jacek/imprudence into next

23 files changed, 82 insertions, 26 deletions

diff --git a/linden/indra/cmake/Boost.cmake b/linden/indra/cmake/Boost.cmake
index 50b8eff..a84a09f 100644
--- a/linden/indra/cmake/Boost.cmake
+++ b/linden/indra/cmake/Boost.cmake
@@ -16,17 +16,7 @@ else (STANDALONE)
 
   if (WINDOWS)
     set(BOOST_VERSION 1_36)
-    if (MSVC71)
-      set(BOOST_PROGRAM_OPTIONS_LIBRARY 
-          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-${BOOST_VERSION}
-          debug libboost_regex-vc71-mt-gd-${BOOST_VERSION})
-      set(BOOST_SIGNALS_LIBRARY 
-          optimized libboost_signals-vc71-mt-${BOOST_VERSION}
-          debug libboost_signals-vc71-mt-gd-${BOOST_VERSION})
-    elseif (MSVC80)
+    if (MSVC80)
       set(BOOST_PROGRAM_OPTIONS_LIBRARY 
           optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
           debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
@@ -46,7 +36,7 @@ else (STANDALONE)
       set(BOOST_SIGNALS_LIBRARY 
           optimized libboost_signals-vc90-mt-${BOOST_VERSION}
           debug libboost_signals-vc90-mt-gd-${BOOST_VERSION})
-    endif (MSVC71)
+    endif (MSVC80)
   elseif (DARWIN)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
     set(BOOST_REGEX_LIBRARY boost_regex-mt)
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index 52f000f..add94dd 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -1,7 +1,7 @@
 # -*- cmake -*-
 
 # The copy_win_libs folder contains file lists and a script used to 
-# copy dlls, exes and such needed to run the SecondLife from within 
+# copy dlls, exes and such needed to run Imprudence from within 
 # VisualStudio. 
 
 include(CMakeCopyIfDifferent)
@@ -62,7 +62,6 @@ set(debug_files
         libogg-0.dll
         liboil-0.3-0.dll
         libopenjpeg-2.dll
-    libpng12-0.dll
         libschroedinger-1.0-0.dll
         libspeex-1.dll
         libtheora-0.dll
@@ -137,7 +136,6 @@ set(release_files
         libogg-0.dll
         liboil-0.3-0.dll
         libopenjpeg-2.dll
-    libpng12-0.dll
         libschroedinger-1.0-0.dll
         libspeex-1.dll
         libtheora-0.dll
@@ -198,7 +196,7 @@ if (MSVC80)
             ARGS
               ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
               ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
-              ${CMAKE_CURRENT_SOURCE_DIR}/SecondLifeDebug.exe.config
+              ${CMAKE_CURRENT_SOURCE_DIR}/ImprudenceDebug.exe.config
               ${debug_appconfig_file}
             DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
             COMMENT "Creating debug app config file"
@@ -243,7 +241,7 @@ if (MSVC80)
             ARGS
               ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
               ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
-              ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config
+              ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
               ${release_appconfig_file}
             DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
             COMMENT "Creating release app config file"
@@ -256,7 +254,7 @@ if (MSVC80)
             ARGS
               ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
               ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
-              ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config
+              ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
               ${relwithdebinfo_appconfig_file}
             DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
             COMMENT "Creating relwithdebinfo app config file"
diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake
index 8f33a95..5d4dffe 100644
--- a/linden/indra/cmake/Variables.cmake
+++ b/linden/indra/cmake/Variables.cmake
@@ -82,7 +82,7 @@ set(VIEWER ON CACHE BOOL "Build Second Life viewer.")
 set(VIEWER_CHANNEL "Imprudence" CACHE STRING "Viewer Channel Name")
 set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing")
 
-set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.")
+set(STANDALONE OFF CACHE BOOL "Do not use Imprudence-supplied prebuilt libraries.")
 
 if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics)
     set(SERVER ON CACHE BOOL "Build Second Life server software.")
diff --git a/linden/indra/cmake/ViewerArtwork.cmake b/linden/indra/cmake/ViewerArtwork.cmake
new file mode 100644
index 0000000..f01109a
--- /dev/null
+++ b/linden/indra/cmake/ViewerArtwork.cmake
@@ -0,0 +1,14 @@
+# -*- cmake -*-
+#
+# Download viewer artwork even when using standalone
+
+include(Variables)
+include(Prebuilt)
+
+if (NOT STANDALONE)
+  use_prebuilt_binary(artwork)
+else (NOT STANDALONE)
+  set(STANDALONE OFF)
+    use_prebuilt_binary(artwork)
+  set(STANDALONE ON)
+endif (NOT STANDALONE)
diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index 8d432fc..7e7350e 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -460,11 +460,16 @@ class WindowsSetup(PlatformSetup):
         'vc90' : {
             'gen' : r'Visual Studio 9 2008',
             'ver' : r'9.0'
+            },
+        'vc100' : {
+            'gen' : r'Visual Studio 10',
+            'ver' : r'10.0'
             }
         }
     gens['vs2003'] = gens['vc71']
     gens['vs2005'] = gens['vc80']
     gens['vs2008'] = gens['vc90']
+    gens['vs2010'] = gens['vc100']
 
     search_path = r'C:\windows'
     exe_suffixes = ('.exe', '.bat', '.com')
@@ -476,14 +481,14 @@ class WindowsSetup(PlatformSetup):
 
     def _get_generator(self):
         if self._generator is None:
-            for version in 'vc80 vc90 vc71'.split():
+            for version in 'vc80 vc90 vc100 vc71'.split():
                 if self.find_visual_studio(version):
                     self._generator = version
                     print 'Building with ', self.gens[version]['gen']
                     break
             else:
                 print >> sys.stderr, 'Cannot find a Visual Studio installation, testing for express editions'
-                for version in 'vc80 vc90 vc71'.split():
+                for version in 'vc80 vc90 vc100 vc71'.split():
                     if self.find_visual_studio_express(version):
                         self._generator = version
                         print 'Building with ', self.gens[version]['gen'] , "Express edition"
diff --git a/linden/indra/llaudio/CMakeLists.txt b/linden/indra/llaudio/CMakeLists.txt
index 70041e7..0a668f9 100644
--- a/linden/indra/llaudio/CMakeLists.txt
+++ b/linden/indra/llaudio/CMakeLists.txt
@@ -2,6 +2,7 @@
 
 project(llaudio)
 
+# Current starting point for CMake. Seems rather arbitrary - MC
 include(00-Common)
 include(Audio)
 include(OPENAL)
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 197857b..cafe004 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -35,6 +35,7 @@ include(GooglePerfTools)
 include(TemplateCheck)
 include(UI)
 include(UnixInstall)
+include(ViewerArtwork)
 include(ViewerMiscLibs)
 
 if (WINDOWS)
@@ -976,7 +977,7 @@ if (WINDOWS)
         res/arrowcopmulti.cur
         res/arrowdrag.cur
         res/circleandline.cur
-        res/icon1.ico
+        res/imp_icon.ico
         res/imprudence_icon.png
         res/llarrow.cur
         res/llarrowdrag.cur
@@ -997,7 +998,6 @@ if (WINDOWS)
         res/lltooltranslate.cur
         res/lltoolzoomin.cur
         res/lltoolzoomout.cur
-        res/ll_icon.ico
         res/resource.h
         res/toolbuy.cur
         res/toolopen.cur
diff --git a/linden/indra/newview/Imprudence.exe.config b/linden/indra/newview/Imprudence.exe.config
new file mode 100644
index 0000000..293a9ba
--- /dev/null
+++ b/linden/indra/newview/Imprudence.exe.config
@@ -0,0 +1,20 @@
+<configuration>
+
+       <windows>
+
+              <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+
+      <dependentAssembly>
+
+        <assemblyIdentity type="win32" name="Microsoft.VC80.CRT" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
+
+        <bindingRedirect oldVersion="8.0.41204.256-" newVersion="0.0.0.0"/>
+
+      </dependentAssembly>
+
+    </assemblyBinding>
+
+       </windows>
+
+</configuration>
+
diff --git a/linden/indra/newview/ImprudenceDebug.exe.config b/linden/indra/newview/ImprudenceDebug.exe.config
new file mode 100644
index 0000000..04d0e00
--- /dev/null
+++ b/linden/indra/newview/ImprudenceDebug.exe.config
@@ -0,0 +1,20 @@
+<configuration>
+
+       <windows>
+
+              <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+
+      <dependentAssembly>
+
+        <assemblyIdentity type="win32" name="Microsoft.VC80.DebugCRT" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
+
+        <bindingRedirect oldVersion="8.0.41204.256-" newVersion="0.0.0.0"/>
+
+      </dependentAssembly>
+
+    </assemblyBinding>
+
+       </windows>
+
+</configuration>
+
diff --git a/linden/indra/newview/res-sdl/imprudence_icon.BMP b/linden/indra/newview/res-sdl/imprudence_icon.BMP
deleted file mode 100644
index c3f4887..0000000
--- a/linden/indra/newview/res-sdl/imprudence_icon.BMP
+++ /dev/null
diff --git a/linden/indra/newview/res/imprudence_icon.png b/linden/indra/newview/res/imprudence_icon.png
deleted file mode 100644
index 8795fa7..0000000
--- a/linden/indra/newview/res/imprudence_icon.png
+++ /dev/null
diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc
index 5e57841..18d8d55 100644
--- a/linden/indra/newview/res/viewerRes.rc
+++ b/linden/indra/newview/res/viewerRes.rc
@@ -61,8 +61,8 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_LL_ICON             ICON                    "ll_icon.ico"
-IDI_LCD_LL_ICON         ICON                    "icon1.ico"
+IDI_LL_ICON             ICON                    "imp_icon.ico"
+//IDI_LCD_LL_ICON         ICON                    "icon1.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -74,7 +74,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
 FONT 8, "MS Sans Serif"
 BEGIN
     ICON            IDI_LL_ICON,IDC_STATIC,7,7,20,20
-    LTEXT           "Loading Second Life...",666,36,13,91,8
+    LTEXT           "Loading Imprudence...",666,36,13,91,8
 END
 
 
diff --git a/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png b/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png
deleted file mode 100644
index f9ea7a2..0000000
--- a/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png
+++ /dev/null
diff --git a/linden/indra/newview/skins/default/textures/arrow_left.tga b/linden/indra/newview/skins/default/textures/arrow_left.tga
deleted file mode 100644
index 68e6280..0000000
--- a/linden/indra/newview/skins/default/textures/arrow_left.tga
+++ /dev/null
diff --git a/linden/indra/newview/skins/default/textures/arrow_right.tga b/linden/indra/newview/skins/default/textures/arrow_right.tga
deleted file mode 100644
index 7a5a30e..0000000
--- a/linden/indra/newview/skins/default/textures/arrow_right.tga
+++ /dev/null
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_32.tga
deleted file mode 100644
index aebeab4..0000000
--- a/linden/indra/newview/skins/default/textures/map_avatar_32.tga
+++ /dev/null
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga
deleted file mode 100644
index 65bd056..0000000
--- a/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga
+++ /dev/null
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga
deleted file mode 100644
index 496c44b..0000000
--- a/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga
+++ /dev/null
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga
deleted file mode 100644
index 782207e..0000000
--- a/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga
+++ /dev/null
diff --git a/linden/indra/newview/skins/silver/textures/arrow_left.tga b/linden/indra/newview/skins/silver/textures/arrow_left.tga
deleted file mode 100644
index 43fbf12..0000000
--- a/linden/indra/newview/skins/silver/textures/arrow_left.tga
+++ /dev/null
diff --git a/linden/indra/newview/skins/silver/textures/arrow_right.tga b/linden/indra/newview/skins/silver/textures/arrow_right.tga
deleted file mode 100644
index a92ac9c..0000000
--- a/linden/indra/newview/skins/silver/textures/arrow_right.tga
+++ /dev/null
diff --git a/linden/indra/tools/vstool/VSTool.exe b/linden/indra/tools/vstool/VSTool.exe
index 6d1497d..ac1cf44 100755
--- a/linden/indra/tools/vstool/VSTool.exe
+++ b/linden/indra/tools/vstool/VSTool.exe
diff --git a/linden/indra/tools/vstool/main.cs b/linden/indra/tools/vstool/main.cs
index 5c41c91..4c33141 100644
--- a/linden/indra/tools/vstool/main.cs
+++ b/linden/indra/tools/vstool/main.cs
@@ -550,6 +550,10 @@ namespace VSTool
                     case "10.00":
                         version = "VC90";
                         break;
+
+                    case "11.00":
+                        version = "VC100";
+                        break;
                     default:
                         throw new ApplicationException("Unknown .sln version: " + format);
                 }
@@ -585,6 +589,10 @@ namespace VSTool
                 case "VC90":
                     progid = "VisualStudio.DTE.9.0";
                     break;
+
+                case "VC100":
+                    progid = "VisualStudio.DTE.10.0";
+                    break;
                 default:
                     throw new ApplicationException("Can't handle VS version: " + version);
             }