diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2012-06-22 16:54:42 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2012-06-22 16:54:42 +0300 |
| commit | 6bb554fc3661d3b8b1284db96bb7c7b0934df621 (patch) | |
| tree | 565b9912d0b3e292030abd850a072f71e1d9e0a6 /indra/newview/llnearbychat.h | |
| parent | d866328f6a9e6537eb8a9775acf4f403b7ad6af6 (diff) | |
CHUI-160 FIXED (Text entered in local chat text field scrolls up and becomes only partially visible after hitting return)
- Replaced LLLineEditor with LLChatEntry in nearby chat
- Moved reshape method from LLIMFloater to the base LLIMConversation so that vertical reshaping work properly for both LLNearbyChat and LLIMFloater
Diffstat (limited to 'indra/newview/llnearbychat.h')
| -rw-r--r-- | indra/newview/llnearbychat.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h index 3dc94ce0da..c9aa69a912 100644 --- a/indra/newview/llnearbychat.h +++ b/indra/newview/llnearbychat.h @@ -71,7 +71,7 @@ public: void onNearbyChatContextMenuItemClicked(const LLSD& userdata); bool onNearbyChatCheckContextMenuItem(const LLSD& userdata); - LLLineEditor* getChatBox() { return mChatBox; } + LLChatEntry* getChatBox() { return mChatBox; } //virtual void draw(); @@ -90,7 +90,7 @@ public: protected: static BOOL matchChatTypeTrigger(const std::string& in_str, std::string* out_str); - static void onChatBoxKeystroke(LLLineEditor* caller, void* userdata); + static void onChatBoxKeystroke(LLTextEditor* caller, void* userdata); static void onChatBoxFocusLost(LLFocusableElement* caller, void* userdata); void onChatBoxFocusReceived(); @@ -113,7 +113,7 @@ protected: // Which non-zero channel did we last chat on? static S32 sLastSpecialChatChannel; - LLLineEditor* mChatBox; + LLChatEntry* mChatBox; LLOutputMonitorCtrl* mOutputMonitor; LLLocalSpeakerMgr* mSpeakerMgr; |