diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-11-07 20:09:25 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-06-23 14:50:04 +0300 |
| commit | 73a1877ff0abcba46f66ef55440274119427723b (patch) | |
| tree | d5596bda308601325576aab40faddefdf6a30edc /indra/newview/llviewerinput.cpp | |
| parent | b5b266c4d2bdf71d89f5d2545e7d6e7966082c90 (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.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llviewerinput.cpp b/indra/newview/llviewerinput.cpp index 3ff4e4eb9d..9f16b6a4d5 100644 --- a/indra/newview/llviewerinput.cpp +++ b/indra/newview/llviewerinput.cpp @@ -936,11 +936,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; @@ -1155,7 +1150,6 @@ LLViewerInput::KeyMode::KeyMode() LLViewerInput::Keys::Keys() : first_person("first_person"), third_person("third_person"), - edit("edit"), sitting("sitting"), edit_avatar("edit_avatar") {} @@ -1182,7 +1176,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); } |