summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinput.cpp
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-11-07 20:09:25 +0200
committerandreykproductengine <andreykproductengine@lindenlab.com>2019-11-07 20:09:25 +0200
commit6ba0b97c851db7822e17a5a8dbb2d0964ca835f7 (patch)
tree23f4b3145ec70e1a855b75d06956ff2d6b367c10 /indra/newview/llviewerinput.cpp
parent65f2c039237b0c538134c17e7958090dc40d4559 (diff)
SL-6109
- Edit mode appears to be obsolete and is not used, cleaned up - Improved ability to set defaults - Improved some labels - Made buttons bigger to accomodate languages with longer descriptions - Added ability to assign key for all modes simultaneously
Diffstat (limited to 'indra/newview/llviewerinput.cpp')
-rw-r--r--indra/newview/llviewerinput.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llviewerinput.cpp b/indra/newview/llviewerinput.cpp
index 50618350be..eaad5ab632 100644
--- a/indra/newview/llviewerinput.cpp
+++ b/indra/newview/llviewerinput.cpp
@@ -934,11 +934,6 @@ BOOL LLViewerInput::modeFromString(const std::string& string, S32 *mode) const
*mode = MODE_THIRD_PERSON;
return TRUE;
}
- else if (string == "EDIT")
- {
- *mode = MODE_EDIT;
- return TRUE;
- }
else if (string == "EDIT_AVATAR")
{
*mode = MODE_EDIT_AVATAR;
@@ -1153,7 +1148,6 @@ LLViewerInput::KeyMode::KeyMode()
LLViewerInput::Keys::Keys()
: first_person("first_person"),
third_person("third_person"),
- edit("edit"),
sitting("sitting"),
edit_avatar("edit_avatar")
{}
@@ -1180,7 +1174,6 @@ S32 LLViewerInput::loadBindingsXML(const std::string& filename)
{
binding_count += loadBindingMode(keys.first_person, MODE_FIRST_PERSON);
binding_count += loadBindingMode(keys.third_person, MODE_THIRD_PERSON);
- binding_count += loadBindingMode(keys.edit, MODE_EDIT);
binding_count += loadBindingMode(keys.sitting, MODE_SITTING);
binding_count += loadBindingMode(keys.edit_avatar, MODE_EDIT_AVATAR);
}