summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloater.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-06-05 10:48:25 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-06-05 10:48:25 +0100
commit033f0dbdef5d23858065dcdcc2f70e5546f50651 (patch)
tree8b02193738179cdd5b35919af8e0ea9311180e1e /indra/newview/llimfloater.h
parenteec00a712fff079009ae793d86e27b7f3ab13053 (diff)
parentd1751df1cc5d9bf853f29555de94faec1912e19f (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llimfloater.h')
-rw-r--r--indra/newview/llimfloater.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h
index fef178e3a2..f1e68a2b3d 100644
--- a/indra/newview/llimfloater.h
+++ b/indra/newview/llimfloater.h
@@ -155,6 +155,10 @@ private:
static void closeHiddenIMToasts();
+ static bool resetAllowedRectPadding(const LLSD& newvalue);
+ //need to keep this static for performance issues
+ static S32 sAllowedRectRightPadding;
+
static void confirmLeaveCallCallback(const LLSD& notification, const LLSD& response);
LLPanelChatControlPanel* mControlPanel;