summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2020-05-19 10:42:37 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2020-05-19 10:42:37 +0300
commitcf2e2a6cf31194c03bdda6531cebada2f0bbf390 (patch)
tree8f4dad567fb57f5d437b8f25e5cc62ae6b5d649c /indra/newview/llstartup.cpp
parent1c82a80b2e48167ba718b6b79d51135cc7e7b371 (diff)
parented3d9abdd01304b5a9708880d9b150fb6568256b (diff)
Merge branch 'master' into DRTVWR-486
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 7673bae725..b532d9a9b4 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -71,6 +71,7 @@
#include "llnotifications.h"
#include "llnotificationsutil.h"
#include "llpersistentnotificationstorage.h"
+#include "llpresetsmanager.h"
#include "llteleporthistory.h"
#include "llregionhandle.h"
#include "llsd.h"
@@ -1965,6 +1966,8 @@ bool idle_startup()
// JC - 7/20/2002
gViewerWindow->sendShapeToSim();
+ LLPresetsManager::getInstance()->createMissingDefault(PRESETS_CAMERA);
+
// The reason we show the alert is because we want to
// reduce confusion for when you log in and your provided
// location is not your expected location. So, if this is