diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
| commit | 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 (patch) | |
| tree | 8153bc399994aabf6e1c41c2d8332e4e8c4ddb78 /indra/newview/llpanellandmedia.h | |
| parent | db0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (diff) | |
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
Diffstat (limited to 'indra/newview/llpanellandmedia.h')
| -rw-r--r-- | indra/newview/llpanellandmedia.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llpanellandmedia.h b/indra/newview/llpanellandmedia.h index aa84b245e2..769bc27532 100644 --- a/indra/newview/llpanellandmedia.h +++ b/indra/newview/llpanellandmedia.h @@ -11,7 +11,6 @@ #define LLPANELLANDMEDIA_H #include "lllineeditor.h" -#include "llmemory.h" // LLHandle<> #include "llpanel.h" #include "llparcelselection.h" #include "lluifwd.h" // widget pointer types @@ -20,7 +19,7 @@ class LLPanelLandMedia : public LLPanel { public: - LLPanelLandMedia(LLHandle<LLParcelSelection>& parcelp); + LLPanelLandMedia(LLSafeHandle<LLParcelSelection>& parcelp); /*virtual*/ ~LLPanelLandMedia(); /*virtual*/ BOOL postBuild(); void refresh(); @@ -50,9 +49,9 @@ private: LLCheckBoxCtrl* mMediaLoopCheck; LLCheckBoxCtrl* mMediaUrlCheck; LLCheckBoxCtrl* mMusicUrlCheck; - LLViewHandle mURLEntryFloater; + LLHandle<LLFloater> mURLEntryFloater; - LLHandle<LLParcelSelection>& mParcel; + LLSafeHandle<LLParcelSelection>& mParcel; }; #endif |