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

15 files changed, 45 insertions, 5 deletions

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