diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-05-19 19:33:30 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-05-19 19:33:30 +0100 |
| commit | 37f5e2aab38172df02dfa8875e7e8560f956cd46 (patch) | |
| tree | 9583349a031fb63e9220c6fbca93b25775e1f26b /indra/newview/llstartup.cpp | |
| parent | a1cfa9ddb297f5bc66dd363800e69d4a7089467c (diff) | |
| parent | ed3d9abdd01304b5a9708880d9b150fb6568256b (diff) | |
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into SL-12995
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 3 |
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 |