summaryrefslogtreecommitdiff
path: root/indra/newview/llchatbar.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-06-17 20:47:41 -0500
committerDave Parks <davep@lindenlab.com>2010-06-17 20:47:41 -0500
commitcb50a2395bc37f1f7833171a976f67af9f2df66d (patch)
tree57822487f245e369fcc03b311256b3f398226a03 /indra/newview/llchatbar.cpp
parente90c1399bc859d828988905968167c179c32432b (diff)
parent9ed825fe5abd569e0e41016b19e3a040bfb09e7a (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)