Second Life viewer sources 1.19.1.0

1 files changed, 18 insertions, 48 deletions

diff --git a/linden/indra/newview/llfloaterland.h b/linden/indra/newview/llfloaterland.h
index 551c7e3..e9198cb 100644
--- a/linden/indra/newview/llfloaterland.h
+++ b/linden/indra/newview/llfloaterland.h
@@ -68,13 +68,10 @@ class LLPanelLandRenters;
 class LLPanelLandCovenant;
 
 class LLFloaterLand
-:       public LLFloater
+:       public LLFloater, public LLUISingleton<LLFloaterLand, VisibilityPolicy<LLFloater> >
 {
+        friend class LLUISingleton<LLFloaterLand, VisibilityPolicy<LLFloater> >;
 public:
-        // Call show() to open a land floater.
-        // Will query the viewer parcel manager to see what is selected.
-        static void show();
-        static BOOL floaterVisible() { return sInstance && sInstance->getVisible(); }
         static void refreshAll();
 
         static LLPanelLandObjects* getCurrentPanelLandObjects();
@@ -82,11 +79,14 @@ public:
 
         // Destroys itself on close.
         virtual void onClose(bool app_quitting);
+        virtual void onOpen();
+        virtual BOOL postBuild();
 
 protected:
+
         // Does its own instance management, so clients not allowed
         // to allocate or destroy.
-        LLFloaterLand();
+        LLFloaterLand(const LLSD& seed);
         virtual ~LLFloaterLand();
 
         void refresh();
@@ -102,7 +102,6 @@ protected:
 
 
 protected:
-        static LLFloaterLand* sInstance;
         static LLParcelSelectionObserver* sObserver;
         static S32 sLastTab;
 
@@ -114,7 +113,7 @@ protected:
         LLPanelLandAccess*              mPanelAccess;
         LLPanelLandCovenant*    mPanelCovenant;
 
-        LLHandle<LLParcelSelection>     mParcel;
+        LLSafeHandle<LLParcelSelection> mParcel;
 
 public:
         // When closing the dialog, we want to deselect the land.  But when
@@ -129,7 +128,7 @@ class LLPanelLandGeneral
 :       public LLPanel
 {
 public:
-        LLPanelLandGeneral(LLHandle<LLParcelSelection>& parcelp);
+        LLPanelLandGeneral(LLSafeHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandGeneral();
         void refresh();
         void refreshNames();
@@ -221,16 +220,16 @@ protected:
         LLButton*               mBtnBuyPass;
         LLButton* mBtnStartAuction;
 
-        LLHandle<LLParcelSelection>&    mParcel;
+        LLSafeHandle<LLParcelSelection>&        mParcel;
 
-        static LLViewHandle sBuyPassDialogHandle;
+        static LLHandle<LLFloater> sBuyPassDialogHandle;
 };
 
 class LLPanelLandObjects
 :       public LLPanel
 {
 public:
-        LLPanelLandObjects(LLHandle<LLParcelSelection>& parcelp);
+        LLPanelLandObjects(LLSafeHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandObjects();
         void refresh();
         virtual void draw();
@@ -293,7 +292,7 @@ protected:
         S32                             mSelectedCount;
         BOOL                    mSelectedIsGroup;
 
-        LLHandle<LLParcelSelection>&    mParcel;
+        LLSafeHandle<LLParcelSelection>&        mParcel;
 };
 
 
@@ -301,7 +300,7 @@ class LLPanelLandOptions
 :       public LLPanel
 {
 public:
-        LLPanelLandOptions(LLHandle<LLParcelSelection>& parcelp);
+        LLPanelLandOptions(LLSafeHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandOptions();
         void refresh();
 
@@ -340,44 +339,15 @@ protected:
         LLCheckBoxCtrl          *mPushRestrictionCtrl;
         LLButton                        *mPublishHelpButton;
 
-        LLHandle<LLParcelSelection>&    mParcel;
-};
-
-
-class LLPanelLandMedia
-:       public LLPanel
-{
-public:
-        LLPanelLandMedia(LLHandle<LLParcelSelection>& parcelp);
-        virtual ~LLPanelLandMedia();
-        void refresh();
-
-        static void onCommitAny(LLUICtrl* ctrl, void *userdata);
-        static void onClickStopMedia ( void* data );
-        static void onClickStartMedia ( void* data );
-
-        virtual BOOL postBuild();
-
-protected:
-        LLCheckBoxCtrl* mCheckSoundLocal;
-        LLRadioGroup*   mRadioVoiceChat;
-        LLLineEditor*   mMusicURLEdit;
-        LLLineEditor*   mMediaURLEdit;
-        LLTextureCtrl*  mMediaTextureCtrl;
-        LLCheckBoxCtrl* mMediaAutoScaleCheck;
-        //LLButton*             mMediaStopButton;
-        //LLButton*             mMediaStartButton;
-
-        LLHandle<LLParcelSelection>&    mParcel;
+        LLSafeHandle<LLParcelSelection>&        mParcel;
 };
 
 
-
 class LLPanelLandAccess
 :       public LLPanel
 {
 public:
-        LLPanelLandAccess(LLHandle<LLParcelSelection>& parcelp);
+        LLPanelLandAccess(LLSafeHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandAccess();
         void refresh();
         void refresh_ui();
@@ -399,7 +369,7 @@ protected:
         LLNameListCtrl*         mListAccess;
         LLNameListCtrl*         mListBanned;
 
-        LLHandle<LLParcelSelection>&    mParcel;
+        LLSafeHandle<LLParcelSelection>&        mParcel;
 };
 
 
@@ -407,7 +377,7 @@ class LLPanelLandCovenant
 :       public LLPanel
 {
 public:
-        LLPanelLandCovenant(LLHandle<LLParcelSelection>& parcelp);
+        LLPanelLandCovenant(LLSafeHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandCovenant();
         virtual BOOL postBuild();
         void refresh();
@@ -417,7 +387,7 @@ public:
         static void updateEstateOwnerName(const std::string& name);
 
 protected:
-        LLHandle<LLParcelSelection>&    mParcel;
+        LLSafeHandle<LLParcelSelection>&        mParcel;
 };
 
 #endif