From 9b9a688dd4528d94c8e84c08c2f5b30f93e2c869 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 29 Jun 2015 08:42:23 +0200
Subject: [PATCH] Backed out changeset 18b2e8ff915d (FIRE-16112) as per mail
 from Oz unless it is stated otherwise

---
 indra/newview/llfloaterland.cpp     | 10 +++-------
 indra/newview/llviewerparcelmgr.cpp |  3 +--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 571137bbce..05c8855965 100755
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -2134,7 +2134,7 @@ void LLPanelLandOptions::refresh()
 	else
 	{
 		// something selected, hooray!
-		//LLViewerRegion* regionp = LLViewerParcelMgr::getInstance()->getSelectionRegion(); // <FS:LO> FIRE-16112 fix
+		LLViewerRegion* regionp = LLViewerParcelMgr::getInstance()->getSelectionRegion();
 
 		// Display options
 		BOOL can_change_options = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_OPTIONS);
@@ -2150,7 +2150,7 @@ void LLPanelLandOptions::refresh()
 		mCheckGroupObjectEntry	->set( parcel->getAllowGroupObjectEntry() ||  parcel->getAllowAllObjectEntry());
 		mCheckGroupObjectEntry	->setEnabled( can_change_options && !parcel->getAllowAllObjectEntry() );
 		
-		//BOOL region_damage = regionp ? regionp->getAllowDamage() : FALSE;  // <FS:LO> FIRE-16112 fix
+		BOOL region_damage = regionp ? regionp->getAllowDamage() : FALSE;
 		
 		// <FS:WF> FIRE-6604 : Reinstate the "Allow Other Residents to Edit Terrain" option in About Land
 		BOOL can_change_terraform = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_EDIT);
@@ -2159,10 +2159,7 @@ void LLPanelLandOptions::refresh()
 		// <FS:WF>	
 		
 		mCheckSafe			->set( !parcel->getAllowDamage() );
-		// <FS:LO> FIRE-16112 fix
-		//mCheckSafe			->setEnabled( can_change_options && region_damage );
-		mCheckSafe			->setEnabled( can_change_options );
-		// </FS:LO>
+		mCheckSafe			->setEnabled( can_change_options && region_damage );
 
 		mCheckFly			->set( parcel->getAllowFly() );
 		mCheckFly			->setEnabled( can_change_options );
@@ -2248,7 +2245,6 @@ void LLPanelLandOptions::refresh()
 			
 			// they can see the checkbox, but its disposition depends on the 
 			// state of the region
-			LLViewerRegion* regionp = LLViewerParcelMgr::getInstance()->getSelectionRegion();  // <FS:LO> FIRE-16112 fix
 			if (regionp)
 			{
 				if (regionp->getSimAccess() == SIM_ACCESS_PG)
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index cbdccb827f..bee436213e 100755
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -754,8 +754,7 @@ bool LLViewerParcelMgr::allowAgentScripts(const LLViewerRegion* region, const LL
 bool LLViewerParcelMgr::allowAgentDamage(const LLViewerRegion* region, const LLParcel* parcel) const
 {
 	return (region && region->getAllowDamage())
-		//&& (parcel && parcel->getAllowDamage());
-		|| (parcel && parcel->getAllowDamage());  // <FS:LO> FIRE-16112 fix
+		&& (parcel && parcel->getAllowDamage());
 }
 
 BOOL LLViewerParcelMgr::isOwnedAt(const LLVector3d& pos_global) const