summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinput.cpp
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-10-28 17:52:31 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-06-23 14:50:03 +0300
commit6597c7696783ce56f89b34a4b6440363635be6a6 (patch)
tree35ded19f04a6685dd4e458efad452c5b80091e96 /indra/newview/llviewerinput.cpp
parent7cec1f3381291ffbf4cc6a07daf4a74d5af5a9ee (diff)
SL-6109
- Fixed line endings in xml file - Removed obsolete UI element and it's code - Fixed issue with return value caused by rebase
Diffstat (limited to 'indra/newview/llviewerinput.cpp')
-rw-r--r--indra/newview/llviewerinput.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerinput.cpp b/indra/newview/llviewerinput.cpp
index 2327ac7f4c..b847923c9c 100644
--- a/indra/newview/llviewerinput.cpp
+++ b/indra/newview/llviewerinput.cpp
@@ -1311,7 +1311,7 @@ bool LLViewerInput::scanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level)
{
if (LLApp::isExiting())
{
- return;
+ return false;
}
S32 mode = getMode();