From dd663449b6f8b802892e11fab7cc2cbce36f734f Mon Sep 17 00:00:00 2001 From: Palmer Date: Fri, 5 Mar 2010 13:07:32 -0800 Subject: Only comments added to crash reporting code on handling old crash logs on mac. No code changed :) --- indra/newview/llappviewermacosx.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp index f8f8f50cd6..80d9b14345 100644 --- a/indra/newview/llappviewermacosx.cpp +++ b/indra/newview/llappviewermacosx.cpp @@ -392,7 +392,12 @@ void LLAppViewerMacOSX::handleCrashReporting(bool reportFreeze) _exit(1); } - // TODO:palmer REMOVE THIS VERY SOON. THIS WILL NOT BE IN VIEWER 2.0 + // TODO from palmer: Find a better way to handle managing old crash logs + // when this is a separate imbedable module. Ideally just sort crash stack + // logs based on date, and grab the latest one as opposed to deleting them + // for thoughts on what the module would look like. + // See: https://wiki.lindenlab.com/wiki/Viewer_Crash_Reporter_Round_4 + // Remove the crash stack log from previous executions. // Since we've started logging a new instance of the app, we can assume // The old crash stack is invalid for the next crash report. -- cgit v1.2.3 From 65ecde210e24a691190444e88090c0cd3c2d9559 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 5 Mar 2010 16:29:37 -0500 Subject: Fix Mac llmediaplugintest build breakage. A viewport array passed to glGetIntegerv() and gluUnProject() was declared as 'int'. This compiles on Windows, but fails on Mac. Declaring as 'GLint' works. --- indra/test_apps/llplugintest/llmediaplugintest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp index 6b275bbcad..e5a846f15a 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.cpp +++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp @@ -307,7 +307,7 @@ GLfloat LLMediaPluginTest::distanceToCamera( GLfloat point_x, GLfloat point_y, G GLdouble modelMatrix[16]; GLdouble projMatrix[16]; - int viewport[4]; + GLint viewport[4]; glGetDoublev(GL_MODELVIEW_MATRIX, modelMatrix); glGetDoublev(GL_PROJECTION_MATRIX, projMatrix); -- cgit v1.2.3