Attempt at fixing windows build issue. Linux breakage TBD.

indra/cmake/BuildBranding.cmake

@@ -1,37 +1,38 @@
 # -*- cmake -*-
 if (WINDOWS)
+   message(WARNING, ${CMAKE_CURRENT_BINARY_DIR}/newview/viewerRes.rc.in)
    configure_file(
        ${CMAKE_SOURCE_DIR}/newview/res/viewerRes.rc.in
-       ${CMAKE_SOURCE_DIR}/newview/res/viewerRes.rc
+       ${CMAKE_CURRENT_BINARY_DIR}/viewerRes.rc
    )
 endif (WINDOWS)
 
 if (DARWIN)
    configure_file(
        ${CMAKE_SOURCE_DIR}/newview/English.lproj/InfoPlist.strings.in
-       ${CMAKE_SOURCE_DIR}/newview/English.lproj/InfoPlist.strings
+       ${CMAKE_CURRENT_BINARY_DIR}/English.lproj/InfoPlist.strings
    )
 endif (DARWIN)
 
 if (LINUX)
    configure_file(
        ${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh.in
-       ${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh
+       ${CMAKE_CURRENT_BINARY_DIR}/linux_tools/wrapper.sh
        @ONLY
    )
    configure_file(
        ${CMAKE_SOURCE_DIR}/newview/linux_tools/handle_secondlifeprotocol.sh.in
-       ${CMAKE_SOURCE_DIR}/newview/linux_tools/handle_secondlifeprotocol.sh
+       ${CMAKE_CURRENT_BINARY_DIR}/linux_tools/handle_secondlifeprotocol.sh
        @ONLY
    )
    configure_file(
        ${CMAKE_SOURCE_DIR}/newview/linux_tools/install.sh.in
-       ${CMAKE_SOURCE_DIR}/newview/linux_tools/install.sh
+       ${CMAKE_CURRENT_BINARY_DIR}/linux_tools/install.sh
        @ONLY
    )
    configure_file(
        ${CMAKE_SOURCE_DIR}/newview/linux_tools/refresh_desktop_app_entry.sh.in
-       ${CMAKE_SOURCE_DIR}/newview/linux_tools/refresh_desktop_app_entry.sh
+       ${CMAKE_CURRENT_BINARY_DIR}/linux_tools/refresh_desktop_app_entry.sh
        @ONLY
    )
 endif (LINUX)

indra/newview/CMakeLists.txt

@@ -6,6 +6,7 @@ include(00-Common)
 include(Boost)
 include(BuildPackagesInfo)
 include(BuildVersion)
+include(BuildBranding)
 include(CMakeCopyIfDifferent)
 include(DBusGlib)
 include(FMODSTUDIO)
@@ -1300,9 +1301,6 @@ if (WINDOWS)
     set_source_files_properties(${viewer_RESOURCE_FILES}
                                 PROPERTIES HEADER_FILE_ONLY TRUE)
 
-    configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/res/viewerRes.rc
-                    ${CMAKE_CURRENT_BINARY_DIR}/viewerRes.rc
-                    )
     set(viewer_RESOURCE_FILES
         ${CMAKE_CURRENT_BINARY_DIR}/viewerRes.rc
         ${viewer_RESOURCE_FILES}

indra/tools/vstool/main.cs

@@ -33,8 +33,8 @@ namespace VSTool
         int IOleMessageFilter.RetryRejectedCall(IntPtr
             hTaskCallee, int dwTickCount, int dwRejectType)
         {
-            if (dwRejectType == 2)
-                // flag = SERVERCALL_RETRYLATER.
+            if (dwRejectType == 1  || dwRejectType == 2)
+                // flag = SERVERCALL_RETRYLATER or SERVERCALL_REJECTED.
             {
                 // Retry the thread call immediately if return >=0 & 
                 // <100.