Object textures can now be export and import

This commit is contained in:
phr0z3nt04st
2010-06-21 16:12:24 -05:00
parent ad350adbcc
commit 5e7529ee36
10 changed files with 823 additions and 286 deletions

View File

@@ -1527,14 +1527,21 @@ bool LLAppViewer::initThreads()
void errorCallback(const std::string &error_string)
{
#ifndef LL_RELEASE_FOR_DOWNLOAD
OSMessageBox(error_string, "Fatal Error", OSMB_OK);
#endif
static std::string last_message;
if(last_message != error_string)
{
U32 response = OSMessageBox(error_string, "Crash Loop?", OSMB_YESNO);
if(response)
{
last_message = error_string;
return;
}
//Set the ErrorActivated global so we know to create a marker file
gLLErrorActivated = true;
LLError::crashAndLoop(error_string);
//Set the ErrorActivated global so we know to create a marker file
gLLErrorActivated = true;
LLError::crashAndLoop(error_string);
}
}
bool LLAppViewer::initLogging()