2 files changed, 8 insertions, 1 deletions
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 03412d95d5..6e7fefeb21 100755
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -50,10 +50,17 @@ add_executable(SLPlugin
     ${SLPlugin_SOURCE_FILES}
 )
 
+if (WINDOWS)
+set_target_properties(SLPlugin
+  PROPERTIES
+  LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMTD\""
+  )
+else ()
 set_target_properties(SLPlugin
   PROPERTIES
   MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/slplugin_info.plist
   )
+endif ()
 
 target_link_libraries(SLPlugin
   ${LLPLUGIN_LIBRARIES}
diff --git a/indra/llplugin/slplugin/slplugin-objc.mm b/indra/llplugin/slplugin/slplugin-objc.mm
index a434739350..a5ab1d95c8 100755
--- a/indra/llplugin/slplugin/slplugin-objc.mm
+++ b/indra/llplugin/slplugin/slplugin-objc.mm
@@ -115,7 +115,7 @@ void LLCocoaPlugin::setupGroup()
     
 }
 
-void LLCocoaPlugin::updateWindows()  //SPATTERS give this a better name.
+void LLCocoaPlugin::updateWindows()  
 {
 //    NSArray* window_list = [NSApp orderedWindows];
 //    NSWindow* current_window = [window_list objectAtIndex:0];