diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/newview/llfloaterland.h | |
parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) |
Merge recent changes
Diffstat (limited to 'indra/newview/llfloaterland.h')
-rw-r--r-- | indra/newview/llfloaterland.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h index 74c1205e1f..8f86766e3d 100644 --- a/indra/newview/llfloaterland.h +++ b/indra/newview/llfloaterland.h @@ -39,6 +39,7 @@ #include "llfloater.h" #include "llpointer.h" // LLPointer<> +//#include "llviewertexturelist.h" #include "llsafehandle.h" typedef std::set<LLUUID, lluuid_less> uuid_list_t; @@ -71,9 +72,9 @@ class LLPanelLandRenters; class LLPanelLandCovenant; class LLFloaterLand -: public LLFloater, public LLFloaterSingleton<LLFloaterLand> +: public LLFloater { - friend class LLUISingleton<LLFloaterLand, VisibilityPolicy<LLFloater> >; + friend class LLFloaterReg; public: static void refreshAll(); @@ -85,13 +86,14 @@ public: virtual void onOpen(const LLSD& key); virtual BOOL postBuild(); -protected: - +private: // Does its own instance management, so clients not allowed // to allocate or destroy. LLFloaterLand(const LLSD& seed); virtual ~LLFloaterLand(); +protected: + /*virtual*/ void refresh(); static void* createPanelLandGeneral(void* data); @@ -328,7 +330,6 @@ private: LLCheckBoxCtrl* mCheckFly; LLCheckBoxCtrl* mCheckGroupScripts; LLCheckBoxCtrl* mCheckOtherScripts; - LLCheckBoxCtrl* mCheckLandmark; LLCheckBoxCtrl* mCheckShowDirectory; LLComboBox* mCategoryCombo; |