Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing

4 files changed, 12 insertions, 31 deletions

diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 5857ee32e7..8a356da93a 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -35,7 +35,7 @@
 
 extern LLControlGroup gSavedSettings;
 #if LL_DARWIN
-extern BOOL gHiDPISupport;
+extern bool gHiDPISupport;
 #endif
 
 static int LOW_PRIORITY_TEXTURE_SIZE_DEFAULT = 256;
@@ -262,10 +262,10 @@ void LLPluginClassMedia::idle(void)
             message.setValueS32("height", mRequestedMediaHeight);
             message.setValueS32("texture_width", mRequestedTextureWidth);
             message.setValueS32("texture_height", mRequestedTextureHeight);
-            message.setValueReal("background_r", mBackgroundColor.mV[VX]);
-            message.setValueReal("background_g", mBackgroundColor.mV[VY]);
-            message.setValueReal("background_b", mBackgroundColor.mV[VZ]);
-            message.setValueReal("background_a", mBackgroundColor.mV[VW]);
+            message.setValueReal("background_r", mBackgroundColor.mV[VRED]);
+            message.setValueReal("background_g", mBackgroundColor.mV[VGREEN]);
+            message.setValueReal("background_b", mBackgroundColor.mV[VBLUE]);
+            message.setValueReal("background_a", mBackgroundColor.mV[VALPHA]);
             mPlugin->sendMessage(message);  // DO NOT just use sendMessage() here -- we want this to jump ahead of the queue.
 
             LL_DEBUGS("Plugin") << "Sending size_change" << LL_ENDL;
diff --git a/indra/llplugin/llpluginmessagepipe.cpp b/indra/llplugin/llpluginmessagepipe.cpp
index 2cbc16ceec..085afc0944 100644
--- a/indra/llplugin/llpluginmessagepipe.cpp
+++ b/indra/llplugin/llpluginmessagepipe.cpp
@@ -371,7 +371,7 @@ bool LLPluginMessagePipe::pumpInput(F64 timeout)
 void LLPluginMessagePipe::processInput(void)
 {
     // Look for input delimiter(s) in the input buffer.
-    int delim;
+    size_t delim;
     mInputMutex.lock();
     while((delim = mInput.find(MESSAGE_DELIMITER)) != std::string::npos)
     {
diff --git a/indra/llplugin/llpluginsharedmemory.cpp b/indra/llplugin/llpluginsharedmemory.cpp
index bfb551ff8d..28a0f0bf4e 100644
--- a/indra/llplugin/llpluginsharedmemory.cpp
+++ b/indra/llplugin/llpluginsharedmemory.cpp
@@ -450,7 +450,7 @@ bool LLPluginSharedMemory::create(size_t size)
                  NULL,                      // default security
                  PAGE_READWRITE,            // read/write access
                  0,                         // max. object size
-                 mSize,                     // buffer size
+                 static_cast<DWORD>(mSize), // buffer size
                  mName.c_str());            // name of mapping object
 
     if(mImpl->mMapFile == NULL)
@@ -478,7 +478,7 @@ bool LLPluginSharedMemory::attach(const std::string &name, size_t size)
 
     mImpl->mMapFile = OpenFileMappingA(
                 FILE_MAP_ALL_ACCESS,        // read/write access
-                FALSE,                      // do not inherit the name
+                false,                      // do not inherit the name
                 mName.c_str());             // name of mapping object
 
     if(mImpl->mMapFile == NULL)
diff --git a/indra/llplugin/slplugin/slplugin.cpp b/indra/llplugin/slplugin/slplugin.cpp
index f2925a1fa1..81a27cf2e5 100644
--- a/indra/llplugin/slplugin/slplugin.cpp
+++ b/indra/llplugin/slplugin/slplugin.cpp
@@ -88,22 +88,6 @@ LONG WINAPI myWin32ExceptionHandler( struct _EXCEPTION_POINTERS* exception_infop
     return EXCEPTION_EXECUTE_HANDLER;
 }
 
-// Taken from : http://blog.kalmbachnet.de/?postid=75
-// The MSVC 2005 CRT forces the call of the default-debugger (normally Dr.Watson)
-// even with the other exception handling code. This (terrifying) piece of code
-// patches things so that doesn't happen.
-LPTOP_LEVEL_EXCEPTION_FILTER WINAPI MyDummySetUnhandledExceptionFilter(
-    LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter )
-{
-    return NULL;
-}
-
-BOOL PreventSetUnhandledExceptionFilter()
-{
-    // remove the scary stuff that also isn't supported on 64 bit Windows
-    return TRUE;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 //  Hook our exception handler and replace the system one
 void initExceptionHandler()
@@ -112,7 +96,6 @@ void initExceptionHandler()
 
     // save old exception handler in case we need to restore it at the end
     prev_filter = SetUnhandledExceptionFilter( myWin32ExceptionHandler );
-    PreventSetUnhandledExceptionFilter();
 }
 
 bool checkExceptionHandler()
@@ -121,18 +104,16 @@ bool checkExceptionHandler()
     LPTOP_LEVEL_EXCEPTION_FILTER prev_filter;
     prev_filter = SetUnhandledExceptionFilter(myWin32ExceptionHandler);
 
-    PreventSetUnhandledExceptionFilter();
-
     if (prev_filter != myWin32ExceptionHandler)
     {
         LL_WARNS("AppInit") << "Our exception handler (" << (void *)myWin32ExceptionHandler << ") replaced with " << prev_filter << "!" << LL_ENDL;
         ok = false;
     }
 
-    if (prev_filter == NULL)
+    if (prev_filter == nullptr)
     {
-        ok = FALSE;
-        if (NULL == myWin32ExceptionHandler)
+        ok = false;
+        if (nullptr == myWin32ExceptionHandler)
         {
             LL_WARNS("AppInit") << "Exception handler uninitialized." << LL_ENDL;
         }
@@ -245,7 +226,7 @@ int main(int argc, char **argv)
         F64 elapsed = timer.getElapsedTimeF64();
         F64 remaining = plugin->getSleepTime() - elapsed;
 
-        if(remaining <= 0.0f)
+        if(remaining <= 0.0)
         {
             // We've already used our full allotment.
 //          LL_INFOS("slplugin") << "elapsed = " << elapsed * 1000.0f << " ms, remaining = " << remaining * 1000.0f << " ms, not sleeping" << LL_ENDL;