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

Fix first character being missed by the chat entry when typing from chat history in in's.

master
Cinders 2013-07-21 06:27:41 -06:00
parent 283f7fc31d
commit d2f4d1986c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/fschathistory.cpp
View File

@ -72,7 +72,7 @@
// <FS_Zi> FIRE-8602: Typing in chat history focuses chat input line
#include "llfocusmgr.h"
#include "llkeyboard.h"
#include "lllineeditor.h"
#include "llchatentry.h"
// </FS:Zi>
#include "llpanelblockedlist.h"
@ -704,8 +704,8 @@ protected:
std::string mFrom;
LLUUID mSessionID;
// [RLVa:KB] - Checked: 2010-04-22 (RLVa-1.2.2a) | Added: RLVa-1.2.0f
bool mShowContextMenu;
bool mShowInfoCtrl;
bool mShowContextMenu;
bool mShowInfoCtrl;
// [/RLVa:KB]
S32 mMinUserNameWidth;
@ -1256,7 +1256,7 @@ BOOL FSChatHistory::handleUnicodeCharHere(llwchar uni_char)
// focus on the next item that is a text input control
focusRoot->focusNextItem(true);
// remember the control's pointer if it really is a LLLineEditor
mChatInputLine = dynamic_cast<LLLineEditor*>(gFocusMgr.getKeyboardFocus());
mChatInputLine = dynamic_cast<LLChatEntry*>(gFocusMgr.getKeyboardFocus());
}
}

4
indra/newview/fschathistory.h
View File

@ -33,7 +33,7 @@
#include "lltextbox.h"
#include "llviewerchat.h"
class LLLineEditor; // <FS_Zi> FIRE-8602: Typing in chat history focuses chat input line
class LLChatEntry; // <FS_Zi> FIRE-8602: Typing in chat history focuses chat input line
//Chat log widget allowing addition of a message as a widget
class FSChatHistory : public LLTextEditor // <FS:Zi> FIRE-8600: TAB out of chat history
@ -148,7 +148,7 @@ class FSChatHistory : public LLTextEditor // <FS:Zi> FIRE-8600: TAB out of chat
public:
virtual BOOL handleUnicodeCharHere(llwchar uni_char);
LLLineEditor* mChatInputLine;
LLChatEntry* mChatInputLine;
// </FS:Zi>
};
#endif // FS_CHATHISTORY_H