diff options
author | Mimika Oh | 2010-10-03 10:57:00 +0100 |
---|---|---|
committer | McCabe Maxsted | 2010-10-08 23:14:31 -0700 |
commit | 9db1c68261afcdcb62fc18d8a54697173dfb7065 (patch) | |
tree | 36271d35a3c59fd560b0f476b52ba72c159e4c6c /linden/indra/newview/llappviewermacosx.cpp | |
parent | Possible fix for an infinite loop in LLTextureCache. (diff) | |
download | meta-impy-9db1c68261afcdcb62fc18d8a54697173dfb7065.zip meta-impy-9db1c68261afcdcb62fc18d8a54697173dfb7065.tar.gz meta-impy-9db1c68261afcdcb62fc18d8a54697173dfb7065.tar.bz2 meta-impy-9db1c68261afcdcb62fc18d8a54697173dfb7065.tar.xz |
Allow build under Mac OS X 10.6 SDK by removing deprecated things.
Incorporated Snowglobe changesets:
http://svn.secondlife.com/trac/linden/changeset/2823
http://svn.secondlife.com/trac/linden/changeset/2757
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llappviewermacosx.cpp | 20 |
1 files changed, 9 insertions, 11 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) | |||
326 | // *NOTE:Mani A better way - make a copy of the data that the crash reporter will send | 326 | // *NOTE:Mani A better way - make a copy of the data that the crash reporter will send |
327 | // and let SL go about its business. This way makes the mac work like windows and linux | 327 | // and let SL go about its business. This way makes the mac work like windows and linux |
328 | // and is the smallest patch for the issue. | 328 | // and is the smallest patch for the issue. |
329 | sCrashReporterIsRunning = true; | 329 | sCrashReporterIsRunning = false; |
330 | ProcessSerialNumber o_psn; | 330 | ProcessSerialNumber o_psn; |
331 | 331 | ||
332 | static EventHandlerRef sCarbonEventsRef = NULL; | 332 | static EventHandlerRef sCarbonEventsRef = NULL; |
@@ -355,17 +355,15 @@ void LLAppViewerMacOSX::handleCrashReporting(bool reportFreeze) | |||
355 | os_result = LSOpenApplication(&appParams, &o_psn); | 355 | os_result = LSOpenApplication(&appParams, &o_psn); |
356 | 356 | ||
357 | if(os_result >= 0) | 357 | if(os_result >= 0) |
358 | { | 358 | { |
359 | EventRecord evt; | 359 | sCrashReporterIsRunning = true; |
360 | while(sCrashReporterIsRunning) | 360 | } |
361 | { | ||
362 | while(WaitNextEvent(osMask, &evt, 0, NULL)) | ||
363 | { | ||
364 | // null op!?! | ||
365 | } | ||
366 | } | ||
367 | } | ||
368 | 361 | ||
362 | while(sCrashReporterIsRunning) | ||
363 | { | ||
364 | RunApplicationEventLoop(); | ||
365 | } | ||
366 | |||
369 | // Re-install the apps quit handler. | 367 | // Re-install the apps quit handler. |
370 | AEInstallEventHandler(kCoreEventClass, | 368 | AEInstallEventHandler(kCoreEventClass, |
371 | kAEQuitApplication, | 369 | kAEQuitApplication, |