diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-03-25 13:21:10 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-03-25 13:21:10 -0500 |
| commit | 180989f28e69600a3bc198b8b62101ec25374bee (patch) | |
| tree | a6e0496f1eba79e5edc4912b2959a1ef86a3aec9 /indra/newview/llchathistory.cpp | |
| parent | 34e79c8f4e251200496651f9ae2b5126a6f7faa3 (diff) | |
| parent | ed98d77fe81a04a03c76e159f8fa963adf6b1109 (diff) | |
Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into SL-17005
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index c110e0d815..cdf82c77c1 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -752,7 +752,7 @@ public: if ( chat.mSourceType == CHAT_SOURCE_OBJECT) { std::string slurl = args["slurl"].asString(); - if (slurl.empty()) + if (slurl.empty() && LLWorld::instanceExists()) { LLViewerRegion *region = LLWorld::getInstance()->getRegionFromPosAgent(chat.mPosAgent); if(region) |