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

Removed the new "Set your own Imprudence tag colour feature".  Should check though, might be bits left that where not obvious.

Conflicts:
	.gitignore
	linden/indra/cmake/00-Common.cmake
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/xui/en-us/panel_login.xml
	linden/indra/newview/viewer_manifest.py
	linden/indra/newview/viewerinfo.cpp

The usual branding conflicts.

2 files changed, 97 insertions, 11 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 9ff5906..897112e 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -1,6 +1,6 @@
 # -*- cmake -*-
 #
-# Compilation options shared by all components.
+# Compilation options shared by all viewer components.
 
 include(Variables)
 
@@ -10,6 +10,8 @@ include(Variables)
 set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1")
 set(CMAKE_CXX_FLAGS_RELEASE
     "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELEASESSE2
+    "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
     "-DLL_RELEASE=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
 
@@ -17,7 +19,7 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
 # Available build types / configurations.
 # Add our current build type first, to coax Xcode into selecting it by default.
 
-set(TYPES ${CMAKE_BUILD_TYPE} RelWithDebInfo Release Debug)
+set(TYPES ${CMAKE_BUILD_TYPE} RelWithDebInfo Release ReleaseSSE2 Debug)
 list(REMOVE_DUPLICATES TYPES)
 set(CMAKE_CONFIGURATION_TYPES ${TYPES} CACHE STRING "Supported build types." FORCE)
 unset(TYPES)
@@ -44,12 +46,18 @@ if (WINDOWS)
       CACHE STRING "C++ compiler release-with-debug options" FORCE)
   if (MSVC80)
       set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /GT /Zi /MD"
-      CACHE STRING "C++ compiler release options" FORCE)
+                "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /GT /Zi /MD"
+                CACHE STRING "C++ compiler release options" FORCE)
+          set(CMAKE_CXX_FLAGS_RELEASESSE2
+                "${CMAKE_CXX_FLAGS_RELEASESSE2} /O2 /Ob2 /Oi /Ot /GT /Zi /MD /arch:SSE2"
+                CACHE STRING "C++ compiler release (SSE2 optimized) options" FORCE)
   else (MSVC80)
       set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD"
-      CACHE STRING "C++ compiler release options" FORCE)
+                "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD"
+                CACHE STRING "C++ compiler release options" FORCE)
+          set(CMAKE_CXX_FLAGS_RELEASESSE2
+                "${CMAKE_CXX_FLAGS_RELEASESSE2} ${LL_CXX_FLAGS} /O2 /Zi /MD /arch:SSE2"
+                CACHE STRING "C++ compiler release (SSE2 optimized) options" FORCE)
   endif (MSVC80)
 
   set(CMAKE_CXX_STANDARD_LIBRARIES "")
@@ -77,6 +85,9 @@ if (WINDOWS)
     set(CMAKE_CXX_FLAGS_RELEASE
       "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
       CACHE STRING "C++ compiler release options" FORCE)
+        set(CMAKE_CXX_FLAGS_RELEASESSE2
+          "${CMAKE_CXX_FLAGS_RELEASESSE2} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
+          CACHE STRING "C++ compiler release (SSE2 optimized) options" FORCE)
    
     add_definitions(
       /Zc:wchar_t-
@@ -195,10 +206,12 @@ if (LINUX)
        add_definitions(-DLINUX64=1 -pipe)
        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers")
     endif (${ARCH} STREQUAL "x86_64")
+        set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2} -mfpmath=sse2 -msse2")
   endif (VIEWER)
 
   set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
   set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}")
+  set(CMAKE_CXX_FLAGS_RELEASESSE2 "-O2 ${CMAKE_CXX_FLAGS_RELEASESSE2}")
 endif (LINUX)
 
 
@@ -217,6 +230,8 @@ if (DARWIN)
   # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
   set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+  set(CMAKE_CXX_FLAGS_RELEASESSE2 "-msse2 -mfpmath=sse ${CMAKE_CXX_FLAGS_RELEASESSE2}") 
+  set(CMAKE_C_FLAGS_RELEASESSE2 "-msse2 -mfpmath=sse ${CMAKE_C_FLAGS_RELEASESSE2}")
 endif (DARWIN)
 
 
@@ -269,3 +284,17 @@ endif (STANDALONE)
 if(SERVER)
   include_directories(${LIBS_PREBUILT_DIR}/include/havok)
 endif(SERVER)
+
+SET(CMAKE_EXE_LINKER_FLAGS_RELEASESSE2
+    "${CMAKE_EXE_LINKER_FLAGS_RELEASE}" CACHE STRING
+    "Flags used for linking binaries under SSE2 optimized build."
+    FORCE )
+SET(CMAKE_SHARED_LINKER_FLAGS_RELEASESSE2
+    "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}" CACHE STRING
+    "Flags used by the shared libraries linker under SSE2 optimized build."
+    FORCE )
+MARK_AS_ADVANCED(
+    CMAKE_CXX_FLAGS_RELEASESSE2
+    CMAKE_C_FLAGS_RELEASESSE2
+    CMAKE_EXE_LINKER_FLAGS_RELEASESSE2
+    CMAKE_SHARED_LINKER_FLAGS_RELEASESSE2 )
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index e7f1aa3..36f99aa 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -177,6 +177,15 @@ copy_if_different(
     )
 set(all_targets ${all_targets} ${out_targets})
 
+
+ copy_if_different(
+    ${plugintest_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/ReleaseSSE2"
+    out_targets
+    ${plugintest_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
 # Release & ReleaseDebInfo config runtime files required for the plugin test mule (Qt image format plugins)
 set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/imageformats")
 set(plugintest_release_files
@@ -205,6 +214,14 @@ set(all_targets ${all_targets} ${out_targets})
 
 copy_if_different(
     ${plugintest_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/ReleaseSSE2/imageformats"
+    out_targets
+    ${plugintest_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${plugintest_release_src_dir}
     "${CMAKE_CURRENT_BINARY_DIR}/Release/llplugin/imageformats"
     out_targets
     ${plugintest_release_files}
@@ -219,6 +236,14 @@ copy_if_different(
     )
 set(all_targets ${all_targets} ${out_targets})
 
+copy_if_different(
+    ${plugintest_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/llplugin/imageformats"
+    out_targets
+    ${plugintest_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
 # Debug config runtime files required for the plugins
 set(plugins_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
 set(plugins_debug_files
@@ -267,6 +292,14 @@ copy_if_different(
     )
 set(all_targets ${all_targets} ${out_targets})
 
+copy_if_different(
+    ${plugins_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/llplugin"
+    out_targets
+    ${plugins_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
 set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
 set(release_files
     alut.dll
@@ -364,14 +397,15 @@ copy_if_different(
 set(all_targets ${all_targets} ${out_targets})
 
 copy_if_different(
-    ${vivox_src_dir} 
-    "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
+    ${release_src_dir} 
+    "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2"
     out_targets 
-    ${vivox_files}
+    ${release_files}
     )
 set(all_targets ${all_targets} ${out_targets})
 
 
+
 # Copy MS C runtime dlls, required for packaging.
 # We always need the VS 2005 redist.
 # *TODO - Adapt this to support VC9
@@ -442,6 +476,14 @@ if(EXISTS ${release_msvc8_redist_path})
         )
     set(all_targets ${all_targets} ${out_targets})
 
+        copy_if_different(
+        ${release_msvc8_redist_path} 
+        "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2"
+        out_targets 
+        ${release_msvc8_files}
+        )
+    set(all_targets ${all_targets} ${out_targets})
+
     set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config)
     add_custom_command(
         OUTPUT ${release_appconfig_file}
@@ -455,6 +497,20 @@ if(EXISTS ${release_msvc8_redist_path})
         COMMENT "Creating release app config file"
         )
 
+
+        set(releasesse2_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/${VIEWER_BINARY_NAME}.exe.config)
+        add_custom_command(
+                OUTPUT ${releasesse2_appconfig_file}
+                COMMAND ${PYTHON_EXECUTABLE}
+                ARGS
+                        ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
+                        ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest
+                        ${CMAKE_CURRENT_SOURCE_DIR}/meta-impy.exe.config
+                        ${releasesse2_appconfig_file}
+                        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest
+                        COMMENT "Creating release (SSE2 optimized) app config file"
+                )
+                
     set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config)
     add_custom_command(
         OUTPUT ${relwithdebinfo_appconfig_file}
@@ -467,13 +523,14 @@ if(EXISTS ${release_msvc8_redist_path})
         DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
         COMMENT "Creating relwithdebinfo app config file"
         )
-      
+          
 endif (EXISTS ${release_msvc8_redist_path})
 
 add_custom_target(copy_win_libs ALL
   DEPENDS 
     ${all_targets}
-    ${release_appconfig_file} 
+    ${release_appconfig_file}
+        ${releasesse2_appconfig_file}
     ${relwithdebinfo_appconfig_file} 
     ${debug_appconfig_file}
   )