summaryrefslogtreecommitdiff
path: root/indra/llcommon/llapp.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-06-17 16:50:35 -0400
committerOz Linden <oz@lindenlab.com>2013-06-17 16:50:35 -0400
commit761bf254a4e72ec521ff1a52ac12f8594a350818 (patch)
treec72f84bb4ac319c10299a35934b52a09a73a127d /indra/llcommon/llapp.cpp
parenta2fa9a2bc26bb67c0bb952d3295c380dcb853eb5 (diff)
parent1e41b017e1713a35eb68190d279cf8d28791b6d2 (diff)
merge changes for 3.6.0-release
Diffstat (limited to 'indra/llcommon/llapp.cpp')
-rwxr-xr-xindra/llcommon/llapp.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp
index c6da205815..67a98d5fb8 100755
--- a/indra/llcommon/llapp.cpp
+++ b/indra/llcommon/llapp.cpp
@@ -986,9 +986,9 @@ bool windows_post_minidump_callback(const wchar_t* dump_path,
}
llinfos << "generated minidump: " << LLApp::instance()->getMiniDumpFilename() << llendl;
- // *NOTE:Mani - this code is stolen from LLApp, where its never actually used.
+ // *NOTE:Mani - this code is stolen from LLApp, where its never actually used.
//OSMessageBox("Attach Debugger Now", "Error", OSMB_OK);
- // *TODO: Translate the signals/exceptions into cross-platform stuff
+ // *TODO: Translate the signals/exceptions into cross-platform stuff
// Windows implementation
llinfos << "Entering Windows Exception Handler..." << llendl;