summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/newview/llappviewer.cpp114
-rw-r--r--indra/newview/llkeyconflict.cpp67
2 files changed, 2 insertions, 179 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 5a64f5e01c..a94bcfd653 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -4428,120 +4428,6 @@ void LLAppViewer::addOnIdleCallback(const boost::function<void()>& cb)
void LLAppViewer::loadKeyBindings()
{
std::string key_bindings_file = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "key_bindings.xml");
-#if 1
- // Legacy support
- // Remove #if-#endif section half a year after DRTVWR-501 releases.
- // Mouse actions are part of keybinding file since DRTVWR-501 instead of being stored in
- // settings.xml. To support legacy viewers that were storing in settings.xml we need to
- // transfer old variables to new format.
- // Also part of backward compatibility is present in LLKeyConflictHandler to modify
- // legacy variables on changes in new system (to make sure we won't enforce
- // legacy values again if user dropped to defaults in new system)
- if (LLVersionInfo::getInstance()->getChannelAndVersion() != gLastRunVersion
- || !gDirUtilp->fileExists(key_bindings_file)) // if file is missing, assume that there were no changes by user yet
- {
- // copy mouse actions and voice key changes to new file
- LL_INFOS("InitInfo") << "Converting legacy mouse bindings to new format" << LL_ENDL;
- // Load settings from file
- LLKeyConflictHandler third_person_view(LLKeyConflictHandler::MODE_THIRD_PERSON);
- LLKeyConflictHandler sitting_view(LLKeyConflictHandler::MODE_SITTING);
-
- // Since we are only modifying keybindings if personal file doesn't exist yet,
- // it should be safe to just overwrite the value
- // If key is already in use somewhere by default, LLKeyConflictHandler should resolve it.
- BOOL value = gSavedSettings.getBOOL("DoubleClickAutoPilot");
- third_person_view.registerControl("walk_to",
- 0,
- value ? EMouseClickType::CLICK_DOUBLELEFT : EMouseClickType::CLICK_NONE,
- KEY_NONE,
- MASK_NONE,
- value);
-
- U32 index = value ? 1 : 0; // we can store multiple combinations per action, so if first is in use by doubleclick, go to second
- value = gSavedSettings.getBOOL("ClickToWalk");
- third_person_view.registerControl("walk_to",
- index,
- value ? EMouseClickType::CLICK_LEFT : EMouseClickType::CLICK_NONE,
- KEY_NONE,
- MASK_NONE,
- value);
-
- value = gSavedSettings.getBOOL("DoubleClickTeleport");
- third_person_view.registerControl("teleport_to",
- 0,
- value ? EMouseClickType::CLICK_DOUBLELEFT : EMouseClickType::CLICK_NONE,
- KEY_NONE,
- MASK_NONE,
- value);
-
- // sitting also supports teleport
- sitting_view.registerControl("teleport_to",
- 0,
- value ? EMouseClickType::CLICK_DOUBLELEFT : EMouseClickType::CLICK_NONE,
- KEY_NONE,
- MASK_NONE,
- value);
-
- std::string key_string = gSavedSettings.getString("PushToTalkButton");
- EMouseClickType mouse = EMouseClickType::CLICK_NONE;
- KEY key = KEY_NONE;
- if (key_string == "MiddleMouse")
- {
- mouse = EMouseClickType::CLICK_MIDDLE;
- }
- else if (key_string == "MouseButton4")
- {
- mouse = EMouseClickType::CLICK_BUTTON4;
- }
- else if (key_string == "MouseButton5")
- {
- mouse = EMouseClickType::CLICK_BUTTON5;
- }
- else
- {
- LLKeyboard::keyFromString(key_string, &key);
- }
-
- value = gSavedSettings.getBOOL("PushToTalkToggle");
- std::string control_name = value ? "toggle_voice" : "voice_follow_key";
- third_person_view.registerControl(control_name, 0, mouse, key, MASK_NONE, true);
- sitting_view.registerControl(control_name, 0, mouse, key, MASK_NONE, true);
-
- if (third_person_view.hasUnsavedChanges())
- {
- // calls loadBindingsXML()
- third_person_view.saveToSettings();
- }
-
- if (sitting_view.hasUnsavedChanges())
- {
- // calls loadBindingsXML()
- sitting_view.saveToSettings();
- }
-
- // in case of voice we need to repeat this in other modes
-
- for (U32 i = 0; i < LLKeyConflictHandler::MODE_COUNT - 1; ++i)
- {
- // edit and first person modes; MODE_SAVED_SETTINGS not in use at the moment
- if (i != LLKeyConflictHandler::MODE_THIRD_PERSON && i != LLKeyConflictHandler::MODE_SITTING)
- {
- LLKeyConflictHandler handler((LLKeyConflictHandler::ESourceMode)i);
-
- handler.registerControl(control_name, 0, mouse, key, MASK_NONE, true);
-
- if (handler.hasUnsavedChanges())
- {
- // calls loadBindingsXML()
- handler.saveToSettings();
- }
- }
- }
- }
- // since something might have gone wrong or there might have been nothing to save
- // (and because otherwise following code will have to be encased in else{}),
- // load everything one last time
-#endif
if (!gDirUtilp->fileExists(key_bindings_file) || !gViewerInput.loadBindingsXML(key_bindings_file))
{
// Failed to load custom bindings, try default ones
diff --git a/indra/newview/llkeyconflict.cpp b/indra/newview/llkeyconflict.cpp
index b6107eeedf..b5ac94b1cd 100644
--- a/indra/newview/llkeyconflict.cpp
+++ b/indra/newview/llkeyconflict.cpp
@@ -619,74 +619,11 @@ void LLKeyConflictHandler::saveToSettings(bool temporary)
}
}
-#if 1
- // Legacy support
- // Remove #if-#endif section half a year after DRTVWR-501 releases.
- // Update legacy settings in settings.xml
- // We only care for third person view since legacy settings can't store
- // more than one mode.
- // We are saving this even if we are in temporary mode - preferences
- // will restore values on cancel
- if (mLoadMode == MODE_THIRD_PERSON && mHasUnsavedChanges)
- {
- bool value = canHandleMouse("walk_to", CLICK_DOUBLELEFT, MASK_NONE);
- gSavedSettings.setBOOL("DoubleClickAutoPilot", value);
-
- value = canHandleMouse("walk_to", CLICK_LEFT, MASK_NONE);
- gSavedSettings.setBOOL("ClickToWalk", value);
-
- // new method can save both toggle and push-to-talk values simultaneously,
- // but legacy one can save only one. It also doesn't support mask.
- LLKeyData data = getControl("toggle_voice", 0);
- bool can_toggle = !data.isEmpty();
- if (!can_toggle)
- {
- data = getControl("voice_follow_key", 0);
- }
-
- gSavedSettings.setBOOL("PushToTalkToggle", can_toggle);
- if (data.isEmpty())
- {
- // legacy viewer has a bug that might crash it if NONE value is assigned.
- // just reset to default
- gSavedSettings.getControl("PushToTalkButton")->resetToDefault(false);
- }
- else
- {
- if (data.mKey != KEY_NONE)
- {
- gSavedSettings.setString("PushToTalkButton", LLKeyboard::stringFromKey(data.mKey));
- }
- else
- {
- std::string ctrl_value;
- switch (data.mMouse)
- {
- case CLICK_MIDDLE:
- ctrl_value = "MiddleMouse";
- break;
- case CLICK_BUTTON4:
- ctrl_value = "MouseButton4";
- break;
- case CLICK_BUTTON5:
- ctrl_value = "MouseButton5";
- break;
- default:
- ctrl_value = "MiddleMouse";
- break;
- }
- gSavedSettings.setString("PushToTalkButton", ctrl_value);
- }
- }
- }
-#endif
-
if (mLoadMode == MODE_THIRD_PERSON && mHasUnsavedChanges)
{
// Map floater should react to doubleclick if doubleclick for teleport is set
- // Todo: Seems conterintuitive for map floater to share inworld controls
- // after these changes release, discuss with UI UX engineer if this should just
- // be set to 1 by default (before release this also doubles as legacy support)
+ // Todo: Seems conterintuitive for map floater to share inworld controls,
+ // discuss with UI UX engineer if this should just be set to 1 by default
bool value = canHandleMouse("teleport_to", CLICK_DOUBLELEFT, MASK_NONE);
gSavedSettings.setBOOL("DoubleClickTeleport", value);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 02:08:58 +0000