diff options
| author | Jonathan Yap <jhwelch@gmail.com> | 2018-01-15 11:40:32 -0500 |
|---|---|---|
| committer | Jonathan Yap <jhwelch@gmail.com> | 2018-01-15 11:40:32 -0500 |
| commit | 3afaa799628c74abdd1542514bc3852432c3925b (patch) | |
| tree | e15cb22d93c67c764b4cb8953904b162e6eaf2a6 /indra/newview/llviewerfloaterreg.cpp | |
| parent | fc29786cb24dd54530169d82a19dbf54ca4fdb31 (diff) | |
STORM-2145 Fixed bug. Now you can only have one of the load/save/delete floaters open at once.
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
| -rw-r--r-- | indra/newview/llviewerfloaterreg.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 440bf46b1e..5237986cd6 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -104,7 +104,7 @@ #include "llfloaterperms.h" #include "llfloaterpostprocess.h" #include "llfloaterpreference.h" -#include "llfloaterpreferencemoveadvanced.h" +#include "llfloaterpreferenceviewadvanced.h" #include "llfloaterpreviewtrash.h" #include "llfloaterproperties.h" #include "llfloaterregiondebugconsole.h" @@ -296,7 +296,7 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("places", "floater_places.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>); LLFloaterReg::add("preferences", "floater_preferences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreference>); LLFloaterReg::add("prefs_graphics_advanced", "floater_preferences_graphics_advanced.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreferenceGraphicsAdvanced>); - LLFloaterReg::add("prefs_move_advanced", "floater_preferences_move_advanced.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreferenceMoveAdvanced>); + LLFloaterReg::add("prefs_view_advanced", "floater_preferences_view_advanced.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreferenceViewAdvanced>); LLFloaterReg::add("prefs_proxy", "floater_preferences_proxy.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreferenceProxy>); LLFloaterReg::add("prefs_spellchecker_import", "floater_spellcheck_import.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSpellCheckerImport>); LLFloaterReg::add("prefs_translation", "floater_translation_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterTranslationSettings>); |