summaryrefslogtreecommitdiff
path: root/indra/newview/llchatbar.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-06-21 15:54:02 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-06-21 15:54:02 -0400
commit4eab82d5e2d71f9b0d53f5a92bc65ecc3320fee7 (patch)
tree0298f612d60eef5a3bea57e625b2582f50d37c44 /indra/newview/llchatbar.cpp
parentc838c6b64563545c15006ac20fd88afe66e5bbfc (diff)
parent17f98b36d3e3bebdcb331f91fc0f542f618be71d (diff)
merge
Diffstat (limited to 'indra/newview/llchatbar.cpp')
-rw-r--r--indra/newview/llchatbar.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
index 67d5d21b2a..cd279fa10a 100644
--- a/indra/newview/llchatbar.cpp
+++ b/indra/newview/llchatbar.cpp
@@ -149,7 +149,6 @@ BOOL LLChatBar::handleKeyHere( KEY key, MASK mask )
{
BOOL handled = FALSE;
- // ALT-RETURN is reserved for windowed/fullscreen toggle
if( KEY_RETURN == key )
{
if (mask == MASK_CONTROL)