diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-07-10 23:44:55 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-07-10 23:51:39 +0300 |
| commit | f554fe2ca74ddf275e47cdce8537e04ab40f9f95 (patch) | |
| tree | 73adf5fc3e4353620f357cf753a9759fae5267bf /indra/newview/llviewerparcelmgr.cpp | |
| parent | 55477e74c79228feb9a5a2d8b970bb9cce2e57a1 (diff) | |
SL-10326 Allow selecting any movable avatars with 'Allow Select Avatar' option
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index c966b7d4f9..d5365e4ee8 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1906,7 +1906,10 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use || music_url.substr(0, 8) == "https://") { LLViewerRegion *region = LLWorld::getInstance()->getRegion(msg->getSender()); - optionally_start_music(music_url, parcel->mLocalID, region->getRegionID()); + if (region) + { + optionally_start_music(music_url, parcel->mLocalID, region->getRegionID()); + } } else { |