diff options
| author | Richard Linden <none@none> | 2011-11-29 23:54:00 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-29 23:54:00 -0800 |
| commit | 0323a37ac6c55e3ed599f60f4950c49e0e084c4a (patch) | |
| tree | 5375e3679b21e8e7893bb5b8761ba681f981c68e /indra/llui/lluictrl.h | |
| parent | f2f90b6ed8e493a42aff805135527d6a7a345e3e (diff) | |
| parent | ff32ef773b19a6d0f7826c7edf7962e2fde492e6 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llui/lluictrl.h')
| -rw-r--r-- | indra/llui/lluictrl.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h index 3e055a9d06..fb2196bb16 100644 --- a/indra/llui/lluictrl.h +++ b/indra/llui/lluictrl.h @@ -223,7 +223,7 @@ public: BOOL focusLastItem(BOOL prefer_text_fields = FALSE); // Non Virtuals - LLHandle<LLUICtrl> getUICtrlHandle() const { return mUICtrlHandle; } + LLHandle<LLUICtrl> getHandle() const { return getDerivedHandle<LLUICtrl>(); } BOOL getIsChrome() const; void setTabStop( BOOL b ); @@ -313,7 +313,6 @@ private: BOOL mRequestsFront; BOOL mTabStop; BOOL mTentative; - LLRootHandle<LLUICtrl> mUICtrlHandle; ETypeTransparency mTransparencyType; |