diff options
| author | Melinda Green <melinda@lindenlab.com> | 2008-12-15 21:21:19 +0000 |
|---|---|---|
| committer | Melinda Green <melinda@lindenlab.com> | 2008-12-15 21:21:19 +0000 |
| commit | e1d8dac25a93db837c780428a23f81cbf9109270 (patch) | |
| tree | a0bcaec0cec1ba6b3ce813764650eada61fcde4f /indra/llui/lluictrl.h | |
| parent | 9c0dbb123376608e464fcd8d1a2e288e01d78a3f (diff) | |
svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
Resolving QAR-1051 Merge featurettes batch #4
Diffstat (limited to 'indra/llui/lluictrl.h')
| -rw-r--r-- | indra/llui/lluictrl.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h index 52ea37ffdd..4ad9042b9a 100644 --- a/indra/llui/lluictrl.h +++ b/indra/llui/lluictrl.h @@ -130,9 +130,7 @@ public: void setTabStop( BOOL b ); BOOL hasTabStop() const; - // Returns containing panel/floater or NULL if none found. - class LLPanel* getParentPanel() const; - class LLUICtrl* getParentUICtrl() const; + LLUICtrl* getParentUICtrl() const; void* getCallbackUserData() const { return mCallbackUserData; } void setCallbackUserData( void* data ) { mCallbackUserData = data; } |