summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAlexanderP ProductEngine <apaschenko@productengine.com>2012-12-03 19:20:11 +0200
committerAlexanderP ProductEngine <apaschenko@productengine.com>2012-12-03 19:20:11 +0200
commit1ce49f764fa00406088f7bcd7623603baedd5fe8 (patch)
treeb8476f9270668c04f604bde673db7016caf3b25e /indra/newview
parentd48357f54765f84a35b73bbf28e88b978bcb5013 (diff)
CHUI-532 FIXED (Viewer crash when user in conversation is removed from participant list because they logged out or teleported away)
delayed destroy of the timer
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llconversationview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index 1b1d61e6d6..40900dce54 100755
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -95,7 +95,7 @@ LLConversationViewSession::~LLConversationViewSession()
LLVoiceClient::getInstance()->removeObserver(mVoiceClientObserver);
}
- delete mFlashTimer;
+ mFlashTimer->unset();
}
bool LLConversationViewSession::isHighlightAllowed()