diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-07-30 19:39:08 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-07-30 19:39:08 -0700 |
| commit | a7efd0d8ddb68315653265d7e4ab87a156e56560 (patch) | |
| tree | 4210ae49796fdb8fb4b28f0bdd857dc338110070 /indra/newview/llviewermenu.cpp | |
| parent | b3a83059c464c9a974d547f57ab8e93ca0bee0f1 (diff) | |
| parent | 29607ab70edea79cfdceaa52d632d77e6699cb8f (diff) | |
Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so I'll need to rebuild that, plus a couple other minor clenaups.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 7071b65228..96ebe49354 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6952,7 +6952,7 @@ void force_error_bad_memory_access(void *) void force_error_infinite_loop(void *) { - LLAppViewer::instance()->forceErrorInifiniteLoop(); + LLAppViewer::instance()->forceErrorInfiniteLoop(); } void force_error_software_exception(void *) |