diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimview.cpp | 10 | 
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 9e6704af26..ce4a032b27 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -3160,11 +3160,13 @@ void LLIMMgr::addMessage(  			}              // Fetch group chat history, enabled by default. -            if (gSavedPerAccountSettings.getBOOL("FetchGroupChatHistory") && gAgent.getRegion()) +            if (gSavedPerAccountSettings.getBOOL("FetchGroupChatHistory"))              { -                std::string chat_url = gAgent.getRegion()->getCapability("ChatSessionRequest"); -                LLCoros::instance().launch("chatterBoxHistoryCoro", -                    boost::bind(&chatterBoxHistoryCoro, chat_url, session_id, from, msg, timestamp)); +                std::string chat_url = gAgent.getRegionCapability("ChatSessionRequest"); +                if (!chat_url.empty()) +                { +                    LLCoros::instance().launch("chatterBoxHistoryCoro", boost::bind(&chatterBoxHistoryCoro, chat_url, session_id, from, msg, timestamp)); +                }              }  			//Play sound for new conversations  | 
