From 662cc980fcd9a00b8566543f190c58590ccf706f Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 23 Jun 2022 13:35:29 +0300
Subject: SL-17643 FIXED noninteractive viewer crashes on locations with parcel
 audio

---
 indra/newview/llviewerparcelmgr.cpp | 9 +++++++--
 1 file 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)
-- 
cgit v1.2.3