Second Life viewer sources 1.19.1.2

1 files changed, 5 insertions, 3 deletions

diff --git a/linden/indra/llui/llfloater.h b/linden/indra/llui/llfloater.h
index 534af16..f0bbcaf 100644
--- a/linden/indra/llui/llfloater.h
+++ b/linden/indra/llui/llfloater.h
@@ -119,7 +119,7 @@ public:
 
         // Can be called multiple times to reset floater parameters.
         // Deletes all children of the floater.
-        virtual void            init(const LLString& title, BOOL resizable, 
+        virtual void            initFloater(const LLString& title, BOOL resizable, 
                                                 S32 min_width, S32 min_height, BOOL drag_on_left,
                                                 BOOL minimizable, BOOL close_btn);
         virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_FLOATER; }
@@ -130,6 +130,8 @@ public:
         // If allowed, close the floater cleanly, releasing focus.
         // app_quitting is passed to onClose() below.
         virtual void    close(bool app_quitting = false);
+
+        /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
         
         // Release keyboard and mouse focus
         void                    releaseFocus();
@@ -303,8 +305,8 @@ public:
         virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_FLOATER_VIEW; }
         virtual LLString getWidgetTag() const { return LL_FLOATER_VIEW_TAG; }
 
-        /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent);
-        void reshape(S32 width, S32 height, BOOL called_from_parent, BOOL adjust_vertical);
+        /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+        void reshapeFloater(S32 width, S32 height, BOOL called_from_parent, BOOL adjust_vertical);
 
         /*virtual*/ void draw();
         /*virtual*/ LLRect getSnapRect() const;