livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

meow-7.2.2
Eli Linden 2010-03-05 14:44:30 -08:00
parent a714e9ed7e 18687a3652
commit f0ea8083eb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llappviewermacosx.cpp
View File

@ -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.

2
indra/test_apps/llplugintest/llmediaplugintest.cpp
View File

@ -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);