From f13cc44f8999a9897c77411d1296582b7bc1f08d Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Tue, 12 Nov 2019 04:21:49 +0200
Subject: Post-merge fixes

---
 indra/newview/llviewermedia.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/llviewermedia.h')

diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index 2b604d3a7a..9467a138f0 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -79,6 +79,7 @@ class LLViewerMedia: public LLSingleton<LLViewerMedia>
 
 public:
 	// String to get/set media autoplay in gSavedSettings
+    static const char* AUTO_PLAY_MEDIA_SETTING;
 	static const char* SHOW_MEDIA_ON_OTHERS_SETTING;
 	static const char* SHOW_MEDIA_WITHIN_PARCEL_SETTING;
 	static const char* SHOW_MEDIA_OUTSIDE_PARCEL_SETTING;
-- 
cgit v1.2.3