diff options
author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/llfloaterland.h | |
parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/llfloaterland.h')
-rw-r--r-- | indra/newview/llfloaterland.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h index 38d58fabfe..9979e8b24a 100644 --- a/indra/newview/llfloaterland.h +++ b/indra/newview/llfloaterland.h @@ -68,7 +68,7 @@ class LLPanelLandRenters; class LLPanelLandCovenant; class LLFloaterLand -: public LLFloater, public LLUISingleton<LLFloaterLand, VisibilityPolicy<LLFloater> > +: public LLFloater, public LLFloaterSingleton<LLFloaterLand> { friend class LLUISingleton<LLFloaterLand, VisibilityPolicy<LLFloater> >; public: @@ -281,9 +281,9 @@ protected: LLButton *mBtnReturnOwnerList; LLNameListCtrl *mOwnerList; - LLPointer<LLViewerImage> mIconAvatarOnline; - LLPointer<LLViewerImage> mIconAvatarOffline; - LLPointer<LLViewerImage> mIconGroup; + LLUIImagePtr mIconAvatarOnline; + LLUIImagePtr mIconAvatarOffline; + LLUIImagePtr mIconGroup; BOOL mFirstReply; |