MAINT-8052: Report if the returned environment is the default.

1 files changed, 36 insertions, 0 deletions

diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 88b3fb7b96..fc4ab0a7a7 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -78,6 +78,7 @@
 #include "lltrans.h"
 #include "llpanelexperiencelisteditor.h"
 #include "llpanelexperiencepicker.h"
+#include "llpanelenvironment.h"
 #include "llexperiencecache.h"
 
 #include "llgroupactions.h"
@@ -138,6 +139,32 @@ protected:
 	LLPanelExperienceListEditor* mBlocked;
 };
 
+#if 0
+class LLPanelLandEnvironment
+    : public LLPanel
+{
+public:
+    LLPanelLandEnvironment(LLSafeHandle<LLParcelSelection>& parcelp);
+    // TODO: LAPRAS
+#if 0
+    virtual BOOL postBuild();
+    void refresh();
+
+    void experienceAdded(const LLUUID& id, U32 xp_type, U32 access_type);
+    void experienceRemoved(const LLUUID& id, U32 access_type);
+protected:
+    LLPanelExperienceListEditor* setupList(const char* control_name, U32 xp_type, U32 access_type);
+    void refreshPanel(LLPanelExperienceListEditor* panel, U32 xp_type);
+
+    LLSafeHandle<LLParcelSelection>&	mParcel;
+
+
+    LLPanelExperienceListEditor* mAllowed;
+    LLPanelExperienceListEditor* mBlocked;
+#endif
+};
+#endif
+
 // inserts maturity info(icon and text) into target textbox 
 // names_floater - pointer to floater which contains strings with maturity icons filenames
 // str_to_parse is string in format "txt1[MATURITY]txt2" where maturity icon and text will be inserted instead of [MATURITY]
@@ -277,6 +304,7 @@ LLFloaterLand::LLFloaterLand(const LLSD& seed)
 	mFactoryMap["land_media_panel"] =	LLCallbackMap(createPanelLandMedia, this);
 	mFactoryMap["land_access_panel"] =	LLCallbackMap(createPanelLandAccess, this);
 	mFactoryMap["land_experiences_panel"] =	LLCallbackMap(createPanelLandExperiences, this);
+    mFactoryMap["land_environment_panel"] = LLCallbackMap(createPanelLandEnvironment, this);
 
 	sObserver = new LLParcelSelectionObserver();
 	LLViewerParcelMgr::getInstance()->addObserver( sObserver );
@@ -386,6 +414,14 @@ void* LLFloaterLand::createPanelLandExperiences(void* data)
 	return self->mPanelExperiences;
 }
 
+//static 
+void* LLFloaterLand::createPanelLandEnvironment(void* data)
+{
+    LLFloaterLand* self = (LLFloaterLand*)data;
+    self->mPanelEnvironment = new LLPanelEnvironmentInfo(/*self->mParcel*/);
+    return self->mPanelEnvironment;
+}
+
 
 //---------------------------------------------------------------------------
 // LLPanelLandGeneral