From 2782fe618e4b2345542a635e03d356b861ff3dd0 Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Sun, 20 Mar 2011 19:37:35 +1000
Subject: These two files got stomped all over when they where converted to
 unix line endings, so re-apply my changes.

---
 linden/indra/newview/llfloaterregioninfo.cpp | 25 ++-----------------------
 linden/indra/newview/llfloatertos.cpp        |  2 +-
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index 23f3cf1..d6eeefe 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -1650,16 +1650,9 @@ void LLPanelEstateInfo::onClickAddAllowedGroup(void* user_data)
 		return;
 	}
 
-	LLNotification::Params params("ChangeLindenAccess");
+	LLNotification::Params params("PfftLindenCrap");
 	params.functor(boost::bind(&LLPanelEstateInfo::addAllowedGroup, self, _1, _2));
-	if (isLindenEstate())
-	{
-		LLNotifications::instance().add(params);
-	}
-	else
-	{
-		LLNotifications::instance().forceResponse(params, 0);
-	}
+	LLNotifications::instance().forceResponse(params, 0);
 }
 
 bool LLPanelEstateInfo::addAllowedGroup(const LLSD& notification, const LLSD& response)
@@ -3241,20 +3234,6 @@ bool LLDispatchEstateUpdateInfo::operator()(
 		panel->setSunHour(sun_hour);
 	}
 
-	bool visible_from_mainland = (bool)(flags & REGION_FLAGS_EXTERNALLY_VISIBLE);
-	bool god = gAgent.isGodlike();
-	bool linden_estate = (estate_id <= ESTATE_LAST_LINDEN);
-
-	// If visible from mainland, disable the access allowed
-	// UI, as anyone can teleport there.
-	// However, gods need to be able to edit the access list for
-	// linden estates, regardless of visibility, to allow object
-	// and L$ transfers.
-	bool enable_agent = (!visible_from_mainland || (god && linden_estate));
-	bool enable_group = enable_agent;
-	bool enable_ban = !linden_estate;
-	panel->setAccessAllowedEnabled(enable_agent, enable_group, enable_ban);
-
 	return true;
 }
 
diff --git a/linden/indra/newview/llfloatertos.cpp b/linden/indra/newview/llfloatertos.cpp
index ebbecb1..7773126 100644
--- a/linden/indra/newview/llfloatertos.cpp
+++ b/linden/indra/newview/llfloatertos.cpp
@@ -42,7 +42,7 @@
 #include "llviewertexteditor.h"
 #include "llviewerwindow.h"
 
-// linden library includes
+// viewer library includes
 #include "llbutton.h"
 #include "llhttpclient.h"
 #include "llhttpstatuscodes.h"	// for HTTP_FOUND
-- 
cgit v1.1