diff options
author | Callum Prentice <callum@gmail.com> | 2020-05-20 14:21:31 -0700 |
---|---|---|
committer | Callum Prentice <callum@gmail.com> | 2020-05-20 14:21:31 -0700 |
commit | b1e063fe8c339c339a5d154e2f48fb8accf6f71c (patch) | |
tree | 02322319b2106e1cb9d6d998e23d3fcd753dadd1 /indra/newview/llstartup.cpp | |
parent | 09802fa8ea9c8459e13a32720088f6d6fb1ad42d (diff) | |
parent | ed3d9abdd01304b5a9708880d9b150fb6568256b (diff) |
Merge branch 'master' into DRTVWR-512
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 |