diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-05-01 02:17:35 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-05-01 02:17:35 +0300 |
| commit | 9874d65e54c21db38efe65dfbb9c52f7c9971488 (patch) | |
| tree | 60b439a413a44f662def4dd7336d7d092a9a58cb | |
| parent | c54382b760c24069d979c0a848c2f6248cb37d7d (diff) | |
Follow-up merge conflict fix
| -rw-r--r-- | indra/newview/llfloaterfixedenvironment.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp index 9978c837b2..4f2c36f45b 100644 --- a/indra/newview/llfloaterfixedenvironment.cpp +++ b/indra/newview/llfloaterfixedenvironment.cpp @@ -180,7 +180,7 @@ void LLFloaterFixedEnvironment::setEditSettingsAndUpdate(const LLSettingsBase::p updateEditEnvironment(); syncronizeTabs(); refresh(); - LLEnvironment::instance().updateEnvironment(LLEnvironment::TRANSITION_FAST); + LLEnvironment::instance().updateEnvironment(LLEnvironment::TRANSITION_INSTANT); } void LLFloaterFixedEnvironment::syncronizeTabs() |