diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-19 11:48:33 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-19 11:48:33 -0400 |
commit | 8342d68ea9d668162bffb6e821c9d8f8d5683c10 (patch) | |
tree | 6450afad234b66c08e6e314a847edee1fb77bff2 /indra/newview/llimprocessing.cpp | |
parent | 8c40e6f0a9e211ec22331385dc66b5ff5233859c (diff) | |
parent | 6d842ac0af814a088c56f437dc885e4ce58b61a8 (diff) |
Merge branch 'develop' into frame-profile-json
Diffstat (limited to 'indra/newview/llimprocessing.cpp')
-rw-r--r-- | indra/newview/llimprocessing.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp index c1e68e0288..590cd09a31 100644 --- a/indra/newview/llimprocessing.cpp +++ b/indra/newview/llimprocessing.cpp @@ -488,7 +488,7 @@ void LLIMProcessing::processNewMessage(LLUUID from_id, case IM_NOTHING_SPECIAL: // p2p IM // Don't show dialog, just do IM if (!gAgent.isGodlike() - && gAgent.getRegion()->isPrelude() + && gAgent.inPrelude() && to_id.isNull()) { // do nothing -- don't distract newbies in |