2 files changed, 11 insertions, 12 deletions

diff --git a/linden/indra/newview/llappviewermacosx.cpp b/linden/indra/newview/llappviewermacosx.cpp
index 3cd0836..1f5b7dc 100644
--- a/linden/indra/newview/llappviewermacosx.cpp
+++ b/linden/indra/newview/llappviewermacosx.cpp
@@ -326,7 +326,7 @@ void LLAppViewerMacOSX::handleCrashReporting(bool reportFreeze)
                         // *NOTE:Mani A better way - make a copy of the data that the crash reporter will send
                         // and let SL go about its business. This way makes the mac work like windows and linux
                         // and is the smallest patch for the issue. 
-                        sCrashReporterIsRunning = true;
+                        sCrashReporterIsRunning = false;
                         ProcessSerialNumber o_psn;
 
                         static EventHandlerRef sCarbonEventsRef = NULL;
@@ -355,17 +355,15 @@ void LLAppViewerMacOSX::handleCrashReporting(bool reportFreeze)
                         os_result = LSOpenApplication(&appParams, &o_psn);
                         
                         if(os_result >= 0)
-                        {       
-                                EventRecord evt;
-                                while(sCrashReporterIsRunning)
-                                {
-                                        while(WaitNextEvent(osMask, &evt, 0, NULL))
-                                        {
-                                                // null op!?!
-                                        }
-                                }
-                        }       
+                        {
+                                sCrashReporterIsRunning = true;
+                        }
 
+                        while(sCrashReporterIsRunning) 
+                        {
+                                RunApplicationEventLoop();
+                        }
+            
                         // Re-install the apps quit handler.
                         AEInstallEventHandler(kCoreEventClass, 
                                                                   kAEQuitApplication, 
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index c8b26be..5be5650 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -7410,7 +7410,8 @@ LLGLuint LLVOAvatar::getScratchTexName( LLGLenum format, U32* texture_bytes )
         {
         case GL_LUMINANCE:                      components = 1; internal_format = GL_LUMINANCE8;                break;
         case GL_ALPHA:                          components = 1; internal_format = GL_ALPHA8;                    break;
-        case GL_COLOR_INDEX:            components = 1; internal_format = GL_COLOR_INDEX8_EXT;  break;
+// Deprecated.  See http://svn.secondlife.com/trac/linden/changeset/2757
+//      case GL_COLOR_INDEX:            components = 1; internal_format = GL_COLOR_INDEX8_EXT;  break;
         case GL_LUMINANCE_ALPHA:        components = 2; internal_format = GL_LUMINANCE8_ALPHA8; break;
         case GL_RGB:                            components = 3; internal_format = GL_RGB8;                              break;
         case GL_RGBA:                           components = 4; internal_format = GL_RGBA8;                             break;