summaryrefslogtreecommitdiff
path: root/indra/newview/llsyswellwindow.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-04-02 12:51:39 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-04-02 12:51:39 -0400
commit5faa2444f91a65b3dfcd2047e578a54226be8577 (patch)
tree05b7468bc6b721d8f8e90cbb77a8f2f8a74ba152 /indra/newview/llsyswellwindow.h
parenta3ba5836f0b24a0b2c3aeff3b97bb88a133ea69c (diff)
parenta7085418df1ada6e19b94b6df772ed21e663d119 (diff)
merge
Diffstat (limited to 'indra/newview/llsyswellwindow.h')
-rw-r--r--indra/newview/llsyswellwindow.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h
index 3790aa3ea9..296bdf7482 100644
--- a/indra/newview/llsyswellwindow.h
+++ b/indra/newview/llsyswellwindow.h
@@ -70,6 +70,7 @@ public:
/*virtual*/ void setDocked(bool docked, bool pop_on_undock = true);
// override LLFloater's minimization according to EXT-1216
/*virtual*/ void setMinimized(BOOL minimize);
+ /*virtual*/ void handleReshape(const LLRect& rect, bool by_user);
void onStartUpToastClick(S32 x, S32 y, MASK mask);
@@ -121,7 +122,7 @@ protected:
typedef std::map<EItemType, S32> typed_items_count_t;
typed_items_count_t mTypedItemsCount;
-
+ bool mIsReshapedByUser;
};
/**