diff options
author | Baker Linden <baker@lindenlab.com> | 2014-05-08 14:00:55 -0700 |
---|---|---|
committer | Baker Linden <baker@lindenlab.com> | 2014-05-08 14:00:55 -0700 |
commit | 37bfd025aeef7292abb1708577eee80b6e1b91d5 (patch) | |
tree | 3dab7c728f3a4b67eae30cbbf838dec8747c5e6e /indra/newview/llspeakingindicatormanager.cpp | |
parent | 1cf659d4481983684c4d5d749d95d56832dbc621 (diff) | |
parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) |
viewer-release merge (to 3.7.8)
Diffstat (limited to 'indra/newview/llspeakingindicatormanager.cpp')
-rwxr-xr-x | indra/newview/llspeakingindicatormanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llspeakingindicatormanager.cpp b/indra/newview/llspeakingindicatormanager.cpp index 07e9371124..78fe7863c8 100755 --- a/indra/newview/llspeakingindicatormanager.cpp +++ b/indra/newview/llspeakingindicatormanager.cpp @@ -279,7 +279,7 @@ void SpeakingIndicatorManager::ensureInstanceDoesNotExist(LLSpeakingIndicator* c // So, using stored deleted pointer leads to crash. See EXT-4782. if (it != mSpeakingIndicators.end()) { - llwarns << "The same instance of indicator has already been registered, removing it: " << it->first << "|"<< speaking_indicator << llendl; + LL_WARNS() << "The same instance of indicator has already been registered, removing it: " << it->first << "|"<< speaking_indicator << LL_ENDL; llassert(it == mSpeakingIndicators.end()); mSpeakingIndicators.erase(it); } |