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/llfloaterloadprefpreset.cpp | |
| parent | a1cfa9ddb297f5bc66dd363800e69d4a7089467c (diff) | |
| parent | ed3d9abdd01304b5a9708880d9b150fb6568256b (diff) | |
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into SL-12995
Diffstat (limited to 'indra/newview/llfloaterloadprefpreset.cpp')
| -rw-r--r-- | indra/newview/llfloaterloadprefpreset.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterloadprefpreset.cpp b/indra/newview/llfloaterloadprefpreset.cpp index 403db35cc0..fa17a9d40e 100644 --- a/indra/newview/llfloaterloadprefpreset.cpp +++ b/indra/newview/llfloaterloadprefpreset.cpp @@ -42,7 +42,8 @@ LLFloaterLoadPrefPreset::LLFloaterLoadPrefPreset(const LLSD &key) // virtual BOOL LLFloaterLoadPrefPreset::postBuild() -{ LLFloaterPreference* preferences = LLFloaterReg::getTypedInstance<LLFloaterPreference>("preferences"); +{ + LLFloaterPreference* preferences = LLFloaterReg::getTypedInstance<LLFloaterPreference>("preferences"); if (preferences) { preferences->addDependentFloater(this); |