summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2019-09-10 23:21:56 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2019-09-10 23:21:56 +0300
commitb31a93baa83dc232e331a0420800fcb6d7faa2d3 (patch)
treed19b0dcd8340aa15d3ecfb1156ca463ab9a495fc /indra/newview/llstartup.cpp
parent83651c49dd42d32bed8f1a3583a61e9226f85f9e (diff)
parent05fcbb5df96c93fa2ba61411c34dcb097ab02c61 (diff)
Upstream merge from lindenlab/viewer-neko
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 77aa7b36b9..5f235c05a6 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -158,6 +158,7 @@
#include "llviewermessage.h"
#include "llviewernetwork.h"
#include "llviewerobjectlist.h"
+#include "llviewerparcelaskplay.h"
#include "llviewerparcelmedia.h"
#include "llviewerparcelmgr.h"
#include "llviewerregion.h"
@@ -1425,6 +1426,10 @@ bool idle_startup()
// create a container's instance for start a controlling conversation windows
// by the voice's events
LLFloaterIMContainer::getInstance();
+ if (gSavedSettings.getS32("ParcelMediaAutoPlayEnable") == 2)
+ {
+ LLViewerParcelAskPlay::getInstance()->loadSettings();
+ }
// *Note: this is where gWorldMap used to be initialized.