livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed line editor history or nearby chat, broken by my previous commit.

meow-7.2.2
ziree 2012-02-13 16:39:43 +01:00
parent f35b5c4e0a
commit 272e6050eb
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llnearbychatcontrol.cpp
View File

@ -251,6 +251,7 @@ BOOL LLNearbyChatControl::handleKeyHere(KEY key, MASK mask )
// autohide the chat bar if escape key was pressed and we're the default chat bar
if(key==KEY_ESCAPE && mask==MASK_NONE)
{
// we let ESC key go through to the rest of the UI code, so don't set handled=TRUE
autohide();
gAgent.stopTyping();
}
@ -285,12 +286,17 @@ BOOL LLNearbyChatControl::handleKeyHere(KEY key, MASK mask )
if (handled == TRUE)
{
// save current line in the history buffer
LLLineEditor::onCommit();
// send chat to nearby chat hub
LLNearbyChat::instance().sendChat(getConvertedText(),type);
setText(LLStringExplicit(""));
autohide();
return TRUE;
}
// let ESC key go through to the rest of the UI code
// let the line editor handle everything we don't handle
return LLLineEditor::handleKeyHere(key,mask);
}