diff options
| author | Richard Linden <none@none> | 2011-11-28 23:15:03 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-28 23:15:03 -0800 |
| commit | acd047b6be30bd1537aa62616ed70b02af7405b3 (patch) | |
| tree | c4a505cb6349927f37e45ab66584886ad20e5170 /indra/llui/llpanel.h | |
| parent | a16bc265da9229bebc7ced7aeccdf56693b88a80 (diff) | |
| parent | 700277e00aa83506808f2128705143d7ae4937bd (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llui/llpanel.h')
| -rw-r--r-- | indra/llui/llpanel.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index ab1c87caff..cd33938226 100644 --- a/indra/llui/llpanel.h +++ b/indra/llui/llpanel.h @@ -153,7 +153,7 @@ public: void setCtrlsEnabled(BOOL b); - LLHandle<LLPanel> getHandle() const { return mPanelHandle; } + LLHandle<LLPanel> getHandle() const { return getDerivedHandle<LLPanel>(); } const LLCallbackMap::map_t& getFactoryMap() const { return mFactoryMap; } @@ -278,7 +278,6 @@ private: LLViewBorder* mBorder; LLButton* mDefaultBtn; LLUIString mLabel; - LLRootHandle<LLPanel> mPanelHandle; typedef std::map<std::string, std::string> ui_string_map_t; ui_string_map_t mUIStrings; |