diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-11-08 22:05:01 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-11-08 22:05:01 +0200 |
| commit | b8a229032efe7c170bfd32e0d31b8b29aac82eec (patch) | |
| tree | 793d6fc8d8fc2a0f4420698b2e74fb53002e66a5 /indra/newview/llimfloater.h | |
| parent | 4ec5ee63e28a427d88dfc0329151eacaf375fdb6 (diff) | |
| parent | 93f9c6991819f53ea03b36dff1af77bbd74ff43b (diff) | |
merging into latest changes
Diffstat (limited to 'indra/newview/llimfloater.h')
| -rw-r--r-- | indra/newview/llimfloater.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h index 6c69ed3462..1fae3cff50 100644 --- a/indra/newview/llimfloater.h +++ b/indra/newview/llimfloater.h @@ -65,7 +65,6 @@ public: // LLView overrides /*virtual*/ BOOL postBuild(); - /*virtual*/ void setFocus(BOOL focusFlag); /*virtual*/ void setVisible(BOOL visible); /*virtual*/ BOOL getVisible(); // Check typing timeout timer. @@ -86,7 +85,7 @@ public: void sessionInitReplyReceived(const LLUUID& im_session_id); // get new messages from LLIMModel - void updateMessages(); + /*virtual*/ void updateMessages(); void reloadMessages(); static void onSendMsg(LLUICtrl*, void*); void sendMsgFromInputEditor(); |