Skip to content
Snippets Groups Projects
Commit 9874d65e authored by Andrey Lihatskiy's avatar Andrey Lihatskiy
Browse files

Follow-up merge conflict fix

parent c54382b7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llfloaterfixedenvironment.cpp
+ 1
− 1
View file @ 9874d65e
...@@ -180,7 +180,7 @@ void LLFloaterFixedEnvironment::setEditSettingsAndUpdate(const LLSettingsBase::p ...@@ -180,7 +180,7 @@ void LLFloaterFixedEnvironment::setEditSettingsAndUpdate(const LLSettingsBase::p
updateEditEnvironment(); updateEditEnvironment();
syncronizeTabs(); syncronizeTabs();
refresh(); refresh();
LLEnvironment::instance().updateEnvironment(LLEnvironment::TRANSITION_FAST); LLEnvironment::instance().updateEnvironment(LLEnvironment::TRANSITION_INSTANT);
} }
void LLFloaterFixedEnvironment::syncronizeTabs() void LLFloaterFixedEnvironment::syncronizeTabs()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment