summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2022-06-23 13:35:29 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2022-06-23 13:35:29 +0300
commit662cc980fcd9a00b8566543f190c58590ccf706f (patch)
tree09941a17d3ca917d91dceb0015e0a3a8750e693e /indra/newview
parent6e686f1ef6fc5ee0b4e4d86f5aae42b58332312a (diff)
SL-17643 FIXED noninteractive viewer crashes on locations with parcel audio
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewerparcelmgr.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 3bd504709b..756bf12ff3 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -1881,8 +1881,13 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
}
else
{
- // Check for video
- LLViewerParcelMedia::getInstance()->update(parcel);
+ if (gNonInteractive)
+ {
+ return;
+ }
+
+ // Check for video
+ LLViewerParcelMedia::getInstance()->update(parcel);
// Then check for music
if (gAudiop)