diff options
| author | Richard Nelson <none@none> | 2010-07-30 09:56:49 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-07-30 09:56:49 -0700 |
| commit | 5a8715f82710d2fe01015c000973f033dca4774f (patch) | |
| tree | 68f513f7697e07fe3a74b362636cecc6a06f8075 /indra/llui/lluictrl.h | |
| parent | b15095c5a9333f3f194859e0549aae2a7fe317c4 (diff) | |
added LLPanel::childSetAction() that does not take a void* argument
implemented childGetVisibleTab/PanelWithHelp using breadth-first-search iterator
moved tentative state from llview to lluictrl
changes llcallbackmap to use boost::function
Diffstat (limited to 'indra/llui/lluictrl.h')
| -rw-r--r-- | indra/llui/lluictrl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h index 1f9d2c9049..259104f72c 100644 --- a/indra/llui/lluictrl.h +++ b/indra/llui/lluictrl.h @@ -147,8 +147,6 @@ public: // LLView interface /*virtual*/ BOOL setLabelArg( const std::string& key, const LLStringExplicit& text ); /*virtual*/ BOOL isCtrl() const; - /*virtual*/ void setTentative(BOOL b); - /*virtual*/ BOOL getTentative() const; /*virtual*/ void onMouseEnter(S32 x, S32 y, MASK mask); /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask); /*virtual*/ BOOL canFocusChildren() const; @@ -180,6 +178,8 @@ public: void setMakeVisibleControlVariable(LLControlVariable* control); void setMakeInvisibleControlVariable(LLControlVariable* control); + virtual void setTentative(BOOL b); + virtual BOOL getTentative() const; virtual void setValue(const LLSD& value); virtual LLSD getValue() const; /// When two widgets are displaying the same data (e.g. during a skin |