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/llfloaterloadprefpreset.cpp | |
| parent | 09802fa8ea9c8459e13a32720088f6d6fb1ad42d (diff) | |
| parent | ed3d9abdd01304b5a9708880d9b150fb6568256b (diff) | |
Merge branch 'master' into DRTVWR-512
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); |