summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinput.cpp
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-10-28 17:52:31 +0200
committerandreykproductengine <andreykproductengine@lindenlab.com>2019-10-28 17:52:31 +0200
commit317dd0e405dfb6ca813118c556f5c23af27cd2a7 (patch)
treeecd003f1087fe59aff8f27af8b93619d51f8fc37 /indra/newview/llviewerinput.cpp
parentca56f6d953ad596d4fc02d8568ca542f57aa5119 (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 fda521933f..8df66b4ce9 100644
--- a/indra/newview/llviewerinput.cpp
+++ b/indra/newview/llviewerinput.cpp
@@ -1309,7 +1309,7 @@ bool LLViewerInput::scanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level)
{
if (LLApp::isExiting())
{
- return;
+ return false;
}
S32 mode = getMode();