Second Life viewer sources 1.14.0.0

1 files changed, 28 insertions, 12 deletions

diff --git a/linden/indra/newview/llfloaterland.h b/linden/indra/newview/llfloaterland.h
index ba92c96..4301306 100644
--- a/linden/indra/newview/llfloaterland.h
+++ b/linden/indra/newview/llfloaterland.h
@@ -50,6 +50,7 @@ class LLParcelSelectionObserver;
 class LLTabContainer;
 class LLTextureCtrl;
 class LLViewerTextEditor;
+class LLParcelSelection;
 
 class LLPanelLandGeneral;
 class LLPanelLandObjects;
@@ -73,9 +74,6 @@ public:
         static LLPanelLandObjects* getCurrentPanelLandObjects();
         static LLPanelLandCovenant* getCurrentPanelLandCovenant();
 
-        // Returns TRUE, but does some early prep work for closing the window.
-        virtual BOOL canClose();
-
         // Destroys itself on close.
         virtual void onClose(bool app_quitting);
 
@@ -112,6 +110,8 @@ protected:
         LLPanelLandCovenant*    mPanelCovenant;
         LLPanelLandRenters*             mPanelRenters;
 
+        LLHandle<LLParcelSelection>     mParcel;
+
 public:
         // When closing the dialog, we want to deselect the land.  But when
         // we send an update to the simulator, it usually replies with the
@@ -125,7 +125,7 @@ class LLPanelLandGeneral
 :       public LLPanel
 {
 public:
-        LLPanelLandGeneral();
+        LLPanelLandGeneral(LLHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandGeneral();
         void refresh();
         void refreshNames();
@@ -217,6 +217,8 @@ protected:
         LLButton*               mBtnBuyPass;
         LLButton* mBtnStartAuction;
 
+        LLHandle<LLParcelSelection>&    mParcel;
+
         static LLViewHandle sBuyPassDialogHandle;
 };
 
@@ -224,7 +226,7 @@ class LLPanelLandObjects
 :       public LLPanel
 {
 public:
-        LLPanelLandObjects();
+        LLPanelLandObjects(LLHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandObjects();
         void refresh();
         virtual void draw();
@@ -234,7 +236,7 @@ public:
         static void callbackReturnOtherObjects(S32, void*);
         static void callbackReturnOwnerList(S32, void*);
 
-        static void clickShowCore(S32 return_type, uuid_list_t* list = 0);
+        static void clickShowCore(LLPanelLandObjects* panelp, S32 return_type, uuid_list_t* list = 0);
         static void onClickShowOwnerObjects(void*);
         static void onClickShowGroupObjects(void*);
         static void onClickShowOtherObjects(void*);
@@ -314,6 +316,8 @@ protected:
         LLString                mSelectedName;
         S32                             mSelectedCount;
         BOOL                    mSelectedIsGroup;
+
+        LLHandle<LLParcelSelection>&    mParcel;
 };
 
 
@@ -321,7 +325,7 @@ class LLPanelLandOptions
 :       public LLPanel
 {
 public:
-        LLPanelLandOptions();
+        LLPanelLandOptions(LLHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandOptions();
         void refresh();
 
@@ -359,6 +363,8 @@ protected:
         LLCheckBoxCtrl          *mMatureCtrl;
         LLCheckBoxCtrl          *mPushRestrictionCtrl;
         LLButton                        *mPublishHelpButton;
+
+        LLHandle<LLParcelSelection>&    mParcel;
 };
 
 
@@ -366,7 +372,7 @@ class LLPanelLandMedia
 :       public LLPanel
 {
 public:
-        LLPanelLandMedia();
+        LLPanelLandMedia(LLHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandMedia();
         void refresh();
 
@@ -384,6 +390,8 @@ protected:
         LLCheckBoxCtrl* mMediaAutoScaleCheck;
         //LLButton*             mMediaStopButton;
         //LLButton*             mMediaStartButton;
+
+        LLHandle<LLParcelSelection>&    mParcel;
 };
 
 
@@ -392,7 +400,7 @@ class LLPanelLandAccess
 :       public LLPanel
 {
 public:
-        LLPanelLandAccess();
+        LLPanelLandAccess(LLHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandAccess();
         void refresh();
         void refreshNames();
@@ -426,6 +434,7 @@ protected:
         LLCheckBoxCtrl*         mCheckTransacted;
         LLRadioGroup*           mCheckStatusLevel;
 
+        LLHandle<LLParcelSelection>&    mParcel;
 };
 
 
@@ -433,7 +442,7 @@ class LLPanelLandBan
 :       public LLPanel
 {
 public:
-        LLPanelLandBan();
+        LLPanelLandBan(LLHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandBan();
         void refresh();
 
@@ -456,6 +465,8 @@ protected:
         LLCheckBoxCtrl*         mCheckDenyAnonymous;
         LLCheckBoxCtrl*         mCheckDenyIdentified;
         LLCheckBoxCtrl*         mCheckDenyTransacted;
+
+        LLHandle<LLParcelSelection>&    mParcel;
 };
 
 
@@ -463,7 +474,7 @@ class LLPanelLandRenters
 :       public LLPanel
 {
 public:
-        LLPanelLandRenters();
+        LLPanelLandRenters(LLHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandRenters();
         void refresh();
 
@@ -475,13 +486,15 @@ protected:
         LLNameListCtrl*         mListRenters;
         LLButton*                       mBtnAddRenter;
         LLButton*                       mBtnRemoveRenter;
+
+        LLHandle<LLParcelSelection>&    mParcel;
 };
 
 class LLPanelLandCovenant
 :       public LLPanel
 {
 public:
-        LLPanelLandCovenant();
+        LLPanelLandCovenant(LLHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandCovenant();
         virtual BOOL postBuild();
         void refresh();
@@ -489,6 +502,9 @@ public:
         static void updateEstateName(const std::string& name);
         static void updateLastModified(const std::string& text);
         static void updateEstateOwnerName(const std::string& name);
+
+protected:
+        LLHandle<LLParcelSelection>&    mParcel;
 };
 
 #endif