diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 19:11:06 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 19:11:06 +0000 |
| commit | d4462963c6ba5db2088723bbedc7b60f1184c594 (patch) | |
| tree | 34aaba4b31f93388b0ce3b2b36e9c49823bec2cf /indra/llui/llfloater.h | |
| parent | b53c377727d216cb277ba14ba4c73b9b9bb96b32 (diff) | |
merge -r 58503:58641 maintenance -> release
Diffstat (limited to 'indra/llui/llfloater.h')
| -rw-r--r-- | indra/llui/llfloater.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 05e513ed1d..79483db297 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -181,8 +181,6 @@ public: void clearSnapTarget() { mSnappedTo.markDead(); } LLViewHandle getSnapTarget() { return mSnappedTo; } - /*virtual*/ LLView* getRootMostFastFrameView(); - static void closeFocusedFloater(); static void onClickClose(void *userdata); @@ -341,10 +339,6 @@ public: LLMultiFloater(const LLString& name, const LLString& rect_control, LLTabContainer::TabPosition tab_pos = LLTabContainer::TOP, BOOL auto_resize = FALSE); virtual ~LLMultiFloater(); - virtual void init(const LLString& title, BOOL resizable, - S32 min_width, S32 min_height, BOOL drag_on_left, - BOOL minimizable, BOOL close_btn); - virtual BOOL postBuild(); /*virtual*/ void open(); /* Flawfinder: ignore */ /*virtual*/ void onClose(bool app_quitting); @@ -378,6 +372,8 @@ public: void setTabContainer(LLTabContainerCommon* tab_container) { if (!mTabContainer) mTabContainer = tab_container; } static void onTabSelected(void* userdata, bool); + virtual void resizeToContents(); + protected: struct LLFloaterData { |