diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-25 09:34:06 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-25 09:34:06 -0400 |
commit | 7c08ddb3f748d2173948335fd799879e3d58d81c (patch) | |
tree | 1f72cc9ec78d7b8c4bad57f4ef14c12a04b7a3a0 /indra/newview/llimfloater.h | |
parent | 1f172281453171175dea76fc469a358e1e932b60 (diff) | |
parent | 444bdef6d4949b6381b8706ab056588bc6bd88eb (diff) |
merge
Diffstat (limited to 'indra/newview/llimfloater.h')
-rw-r--r-- | indra/newview/llimfloater.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h index 5158f6c1f7..f7cd35b5eb 100644 --- a/indra/newview/llimfloater.h +++ b/indra/newview/llimfloater.h @@ -145,8 +145,6 @@ private: static void* createPanelIMControl(void* userdata); static void* createPanelGroupControl(void* userdata); static void* createPanelAdHocControl(void* userdata); - // gets a rect that bounds possible positions for the LLIMFloater on a screen (EXT-1111) - void getAllowedRect(LLRect& rect); // Add the "User is typing..." indicator. void addTypingIndicator(const LLIMInfo* im_info); @@ -156,10 +154,6 @@ private: static void closeHiddenIMToasts(); - static bool resetAllowedRectPadding(); - //need to keep this static for performance issues - static S32 sAllowedRectRightPadding; - static void confirmLeaveCallCallback(const LLSD& notification, const LLSD& response); LLPanelChatControlPanel* mControlPanel; |