diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-14 13:55:00 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-14 13:55:00 -0800 |
commit | 04fe0399443cf4a5852e94cd3950ba1fd2d50562 (patch) | |
tree | 805e57d9bc12d869e87994380d5b023137fef48f /indra/newview/llimfloater.h | |
parent | af2cbcee129911cb4e1d25fbd710d755c13b0282 (diff) |
Backed out changeset d5b761982e63
This got pushed too early - sorry. Sigh.
Diffstat (limited to 'indra/newview/llimfloater.h')
-rw-r--r-- | indra/newview/llimfloater.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h index d9db385d06..bc7a43e852 100644 --- a/indra/newview/llimfloater.h +++ b/indra/newview/llimfloater.h @@ -64,6 +64,7 @@ public: // LLFloater overrides /*virtual*/ void onClose(bool app_quitting); /*virtual*/ void setDocked(bool docked, bool pop_on_undock = true); + /*virtual*/ void setTornOff(bool torn_off); // Make IM conversion visible and update the message history static LLIMFloater* show(const LLUUID& session_id); @@ -74,8 +75,6 @@ public: static LLIMFloater* findInstance(const LLUUID& session_id); - static LLIMFloater* getInstance(const LLUUID& session_id); - void sessionInitReplyReceived(const LLUUID& im_session_id); // get new messages from LLIMModel @@ -114,8 +113,6 @@ public: //used as a callback on receiving new IM message static void sRemoveTypingIndicator(const LLSD& data); - static void onIMChicletCreated(const LLUUID& session_id); - private: // process focus events to set a currently active session /* virtual */ void onFocusLost(); |