From 1d79d101ecaa0a4b365e7f28ca022c1e19a43108 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 21 Mar 2022 17:39:33 +0200 Subject: SL-17040 Crash when looking for a region by handle or position Might be a better idea to turn LLWorld back into an LLSingleton. Too many things to track. --- indra/newview/llchathistory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llchathistory.cpp') 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) -- cgit v1.3