diff -r a95b822cf2c2 -r 184a05e35844 doc/contributions.txt
--- a/doc/contributions.txt	Sat Aug 20 08:49:31 2011 -0400
+++ b/doc/contributions.txt	Sun Aug 21 07:24:09 2011 -0500
@@ -804,6 +804,7 @@
 	OPEN-1
 	STORM-1087
 	STORM-1090
+	OPEN-112
 Nicoladie Gymnast
 Nounouch Hapmouche
 	VWR-238
diff -r a95b822cf2c2 -r 184a05e35844 indra/cmake/Copy3rdPartyLibs.cmake
--- a/indra/cmake/Copy3rdPartyLibs.cmake	Sat Aug 20 08:49:31 2011 -0400
+++ b/indra/cmake/Copy3rdPartyLibs.cmake	Sun Aug 21 07:24:09 2011 -0500
@@ -34,6 +34,9 @@
     set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
     set(debug_files
         openjpegd.dll
+    #Openjpegd.dll ia a dependency of llui_libtest renamed to openjpeg.dll which is the viewer dependency.
+    #Manual copy openjpegd.dll to openjpeg.dll pending a 3p-openjpeg change.
+        openjpeg.dll 
         libapr-1.dll
         libaprutil-1.dll
         libapriconv-1.dll
@@ -130,7 +133,7 @@
     FIND_PATH(debug_msvc10_redist_path msvcr100d.dll
         PATHS
         ${MSVC_DEBUG_REDIST_PATH}
-         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC100.DebugCRT
+        [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC100.DebugCRT
         [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/SysWOW64
         [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/System32
         NO_DEFAULT_PATH
@@ -155,7 +158,7 @@
     FIND_PATH(release_msvc10_redist_path msvcr100.dll
         PATHS
         ${MSVC_REDIST_PATH}
-         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC100.CRT
+        {HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC100.CRT
         [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/SysWOW64
         [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/System32
         NO_DEFAULT_PATH
diff -r a95b822cf2c2 -r 184a05e35844 indra/newview/CMakeLists.txt
--- a/indra/newview/CMakeLists.txt	Sat Aug 20 08:49:31 2011 -0400
+++ b/indra/newview/CMakeLists.txt	Sun Aug 21 07:24:09 2011 -0500
@@ -1564,7 +1564,10 @@
       ${SHARED_LIB_STAGING_DIR}/Debug/libcollada14dom22-d.dll
       ${SHARED_LIB_STAGING_DIR}/Release/openjpeg.dll
       ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/openjpeg.dll
-      ${SHARED_LIB_STAGING_DIR}/Debug/openjpegd.dll
+#      ${SHARED_LIB_STAGING_DIR}/Debug/openjpegd.dll
+# the viewer dependency is for a file name without the d. /Debug/openjpeg.dll is a manual rename of openjpgd.dll 
+# pending a change to 3p-openjpeg to provide both in lib/debug. Some test require depend on openjpegd.dll
+      ${SHARED_LIB_STAGING_DIR}/Debug/openjpeg.dll
       ${SHARED_LIB_STAGING_DIR}/Release/fmod.dll
       ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/fmod.dll
       ${SHARED_LIB_STAGING_DIR}/Debug/fmod.dll
diff -r a95b822cf2c2 -r 184a05e35844 indra/newview/viewer_manifest.py
--- a/indra/newview/viewer_manifest.py	Sat Aug 20 08:49:31 2011 -0400
+++ b/indra/newview/viewer_manifest.py	Sun Aug 21 07:24:09 2011 -0500
@@ -361,7 +361,10 @@
 
             # For textures
             if self.args['configuration'].lower() == 'debug':
-                self.path("openjpegd.dll")
+            #    self.path("openjpegd.dll")
+            # the viewer dependency is for a file name without the d. /Debug/openjpeg.dll is a manual rename of openjpgd.dll 
+            # pending a change to 3p-openjpeg to provide both in lib/debug. Some test require depend on openjpegd.dll
+                self.path("openjpeg.dll")
             else:
                 self.path("openjpeg.dll")