diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-08-17 14:50:03 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-08-17 14:50:03 +0300 |
| commit | 0191ee5f6f96eafa20e838ee1737eea58dafb1de (patch) | |
| tree | d78ff83baecc18063810e7e1e27b9ce1abd38b37 /indra/newview/llimprocessing.cpp | |
| parent | aa5c4d45aa36df1c4dad7b68b4e1b760420409ad (diff) | |
SL-17973 FIXED region name is not shown in the IM chat
Diffstat (limited to 'indra/newview/llimprocessing.cpp')
| -rw-r--r-- | indra/newview/llimprocessing.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp index 0524313a5c..d29e0314b4 100644 --- a/indra/newview/llimprocessing.cpp +++ b/indra/newview/llimprocessing.cpp @@ -55,6 +55,7 @@ #include "llviewerwindow.h" #include "llviewerregion.h" #include "llvoavatarself.h" +#include "llworld.h" #include "boost/lexical_cast.hpp" #if LL_MSVC @@ -572,6 +573,15 @@ void LLIMProcessing::processNewMessage(LLUUID from_id, } if (!mute_im) { + bool region_message = false; + if (region_id.isNull()) + { + LLViewerRegion* regionp = LLWorld::instance().getRegionFromID(from_id); + if (regionp) + { + region_message = true; + } + } gIMMgr->addMessage( session_id, from_id, @@ -583,7 +593,7 @@ void LLIMProcessing::processNewMessage(LLUUID from_id, parent_estate_id, region_id, position, - true); + region_message); } else { |