summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2020-05-19 22:37:41 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2020-05-19 22:37:41 +0300
commitaaaf3189c400e491c6adc533f8b03dfecddb1dd9 (patch)
tree57872267bb777945a568574ee19bcda578738d76 /indra/newview/llstartup.cpp
parent847cce915dd54166ca3b4fd6bfb8b3c697433abf (diff)
parentb86fdf1c316a49bab69d7ef6b3751565bedf8f59 (diff)
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
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 a66a8b61ef..c63bd3b2b8 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"
@@ -1966,6 +1967,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