Merge branch 'master' of git://github.com/siana/SingularityViewer.git

Conflicts:
	indra/llrender/llglstates.h
This commit is contained in:
Shyotl
2011-03-25 17:54:52 -05:00
25 changed files with 1298 additions and 152 deletions

View File

@@ -2154,9 +2154,7 @@ bool LLAppViewer::initConfiguration()
void LLAppViewer::checkForCrash(void)
{
// <edit> screw sending crash reports
#if LL_SEND_CRASH_REPORTS && 0
// </edit>
#if LL_SEND_CRASH_REPORTS
//*NOTE:Mani The current state of the crash handler has the MacOSX
// sending all crash reports as freezes, in order to let
// the MacOSX CrashRepoter generate stacks before spawning the