From a0c228d84240a80437b63e0a2cd1cee24e8004a0 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 16 Jan 2018 11:03:26 -0800
Subject: MAINT-8052: Report if the returned environment is the default.

---
 indra/newview/llfloaterland.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llfloaterland.h')

diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h
index 0540ddb880..e5837b5a08 100644
--- a/indra/newview/llfloaterland.h
+++ b/indra/newview/llfloaterland.h
@@ -67,6 +67,8 @@ class LLPanelLandRenters;
 class LLPanelLandCovenant;
 class LLParcel;
 class LLPanelLandExperiences;
+//class LLPanelLandEnvironment;
+class LLPanelEnvironmentInfo;
 
 class LLFloaterLand
 :	public LLFloater
@@ -103,7 +105,8 @@ protected:
 	static void* createPanelLandMedia(void* data);
 	static void* createPanelLandAccess(void* data);
 	static void* createPanelLandExperiences(void* data);
-	static void* createPanelLandBan(void* data);
+    static void* createPanelLandEnvironment(void* data);
+    static void* createPanelLandBan(void* data);
 
 
 protected:
@@ -119,6 +122,7 @@ protected:
 	LLPanelLandAccess*		mPanelAccess;
 	LLPanelLandCovenant*	mPanelCovenant;
 	LLPanelLandExperiences*	mPanelExperiences;
+    LLPanelEnvironmentInfo *mPanelEnvironment;
 
 	LLSafeHandle<LLParcelSelection>	mParcel;
 
-- 
cgit v1.2.3


From 1b8c2b5ebbe0d42f147730bc9b6528fa8c6796ce Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 23 Jan 2018 08:54:34 -0800
Subject: MAINT-8052: Initial support for new EEP cap

---
 indra/newview/llfloaterland.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llfloaterland.h')

diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h
index e5837b5a08..0eea46bc5a 100644
--- a/indra/newview/llfloaterland.h
+++ b/indra/newview/llfloaterland.h
@@ -67,8 +67,7 @@ class LLPanelLandRenters;
 class LLPanelLandCovenant;
 class LLParcel;
 class LLPanelLandExperiences;
-//class LLPanelLandEnvironment;
-class LLPanelEnvironmentInfo;
+class LLPanelLandEnvironment;
 
 class LLFloaterLand
 :	public LLFloater
@@ -122,7 +121,7 @@ protected:
 	LLPanelLandAccess*		mPanelAccess;
 	LLPanelLandCovenant*	mPanelCovenant;
 	LLPanelLandExperiences*	mPanelExperiences;
-    LLPanelEnvironmentInfo *mPanelEnvironment;
+    LLPanelLandEnvironment *mPanelEnvironment;
 
 	LLSafeHandle<LLParcelSelection>	mParcel;
 
-- 
cgit v1.2.3