livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-31800: Fix doubleClick teleport enabled/disabled message is missing

master
Ansariel 2022-07-11 09:31:23 +02:00
parent 9ff85afe51
commit dac349f2f6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewermenu.cpp
View File

@ -9681,6 +9681,7 @@ void setDoubleClickAction(const std::string& control)
bool ignore_mask = true;
conflictHandler.registerControl(control, index, click, key, mask, ignore_mask);
report_to_nearby_chat(LLTrans::getString("DoubleClickTeleportEnabled"));
}
else
{
@ -9691,6 +9692,7 @@ void setDoubleClickAction(const std::string& control)
if (data.mMouse == click && data.mKey == key && data.mMask == mask)
{
conflictHandler.clearControl(control, i);
report_to_nearby_chat(LLTrans::getString("DoubleClickTeleportDisabled"));
}
}
}
@ -9698,7 +9700,7 @@ void setDoubleClickAction(const std::string& control)
conflictHandler.saveToSettings();
}
bool isDoubleClickActionEnabled(const std::string control)
bool isDoubleClickActionEnabled(const std::string& control)
{
constexpr LLKeyConflictHandler::ESourceMode mode{ LLKeyConflictHandler::MODE_THIRD_PERSON };
constexpr EMouseClickType click{ EMouseClickType::CLICK_DOUBLELEFT };