diff options
| author | Don Kjer <don@lindenlab.com> | 2007-05-08 22:20:26 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-05-08 22:20:26 +0000 |
| commit | a154ec72f759e20add6aacfab7f04e65b49051b9 (patch) | |
| tree | 6410887f2466911a7a28574e7778d6fc7d416c67 /indra/llui/llfloater.h | |
| parent | 60a09f20f450ced238afc74e806d080b3c13cc33 (diff) | |
svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/llui/llfloater.h')
| -rw-r--r-- | indra/llui/llfloater.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 79483db297..90063108f5 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -88,8 +88,7 @@ public: static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); void initFloaterXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory, BOOL open = TRUE); - /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = 1); - /*virtual*/ void translate(S32 x, S32 y); + /*virtual*/ void userSetShape(const LLRect& new_rect); /*virtual*/ BOOL canSnapTo(LLView* other_view); /*virtual*/ void snappedTo(LLView* snap_view); /*virtual*/ void setFocus( BOOL b ); |