diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-03 17:01:53 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-03 17:01:53 -0800 |
| commit | ad7cb33bbc4f3dae5ad8396b11e98d2e1490e349 (patch) | |
| tree | b3eca812c6f582332a107ccb28c1b4a94df8d3cf /indra/newview/llconversationview.cpp | |
| parent | 2ee6bcab371a08791bccad3a4fa072c1d60cd6c9 (diff) | |
| parent | 1ce49f764fa00406088f7bcd7623603baedd5fe8 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llconversationview.cpp')
| -rwxr-xr-x | indra/newview/llconversationview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index a696fbdb47..16d57678db 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() |