summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-03-13 23:33:12 +0000
committerAura Linden <aura@lindenlab.com>2014-03-13 23:33:12 +0000
commit8d5b933ad0c1b96778d0460f142ceadaf4be11fb (patch)
tree76f6fb30e194e0c416a7082526242a3438de92cf
parent706ec08deb3feaea9c5c3516dea657b86b0474c3 (diff)
Probable fix for linux hang.
-rwxr-xr-xindra/llcommon/llerror.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index dd36eca8ba..853f279c95 100755
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -1197,15 +1197,14 @@ namespace LLError
#endif
void crashAndLoop(const std::string& message)
{
+ // Now, we go kaboom!
+ int* make_me_crash = NULL;
+
+ *make_me_crash = 0;
+
while(true)
{
// Loop forever, in case the crash didn't work?
-
- // Now, we go kaboom!
- int* make_me_crash = NULL;
-
- *make_me_crash = 0;
-
}
// this is an attempt to let Coverity and other semantic scanners know that this function won't be returning ever.