diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-05-31 17:10:48 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-05-31 17:10:48 +0100 |
| commit | eb8eaa58a4e28b4db2736000f22fbd97371ef9db (patch) | |
| tree | f27b7dccc4409bce20d9173a6f17d971c689637e /indra/newview/llfloaterloadprefpreset.cpp | |
| parent | c70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff) | |
| parent | f0ae109b696671c5773a5084a7329d0b164b7735 (diff) | |
Merge storm-2145 dev into lindenlab branch parented from viewer-release
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); |