diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-19 22:37:41 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-19 22:37:41 +0300 |
| commit | aaaf3189c400e491c6adc533f8b03dfecddb1dd9 (patch) | |
| tree | 57872267bb777945a568574ee19bcda578738d76 /indra/newview/llfloaterloadprefpreset.cpp | |
| parent | 847cce915dd54166ca3b4fd6bfb8b3c697433abf (diff) | |
| parent | b86fdf1c316a49bab69d7ef6b3751565bedf8f59 (diff) | |
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
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 36fae0391c..f89daf3e04 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); |