summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2016-09-16 16:34:47 +0300
committerandreykproductengine <akleshchev@productengine.com>2016-09-16 16:34:47 +0300
commitc94496db9ea8ae872dd3d40b53a6329571322629 (patch)
treecd851f5116913e8b825aba1d74f5b339da816b83
parent8a3780405f60396f9cd8af024151d05cb595be17 (diff)
MAINT-6694 Console overflow crash in gestures.
-rw-r--r--indra/newview/llfloatergesture.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatergesture.cpp b/indra/newview/llfloatergesture.cpp
index d842106146..b840d37c4d 100644
--- a/indra/newview/llfloatergesture.cpp
+++ b/indra/newview/llfloatergesture.cpp
@@ -328,7 +328,7 @@ void LLFloaterGesture::addGesture(const LLUUID& item_id , LLMultiGesture* gestur
element["columns"][0]["font"]["name"] = "SANSSERIF";
element["columns"][0]["font"]["style"] = font_style;
- std::string key_string = LLKeyboard::stringFromKey(gesture->mKey);
+ std::string key_string;
std::string buffer;
if (gesture->mKey == KEY_NONE)
@@ -338,6 +338,7 @@ void LLFloaterGesture::addGesture(const LLUUID& item_id , LLMultiGesture* gestur
}
else
{
+ key_string = LLKeyboard::stringFromKey(gesture->mKey);
buffer = LLKeyboard::stringFromAccelerator(gesture->mMask,
gesture->mKey);
}