From d06e5e3519f13197dd62bfbabf76f7efcc3d7a79 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Sat, 29 Dec 2007 01:40:57 +0000
Subject: svn merge -r 76642:76643
 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-4-merge-76640

Redo of QAR-170, with correct range. Reviewed by CG.
---
 indra/newview/llfloaterregioninfo.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llfloaterregioninfo.cpp')

diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index eaf7832eab..ca0314cce1 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -2378,7 +2378,12 @@ BOOL LLPanelEstateInfo::checkRemovalButton(std::string name)
 	}
 	else if (name == "estate_manager_name_list")
 	{
-		btn_name = "remove_estate_manager_btn";
+		//ONLY OWNER CAN ADD /DELET ESTATE MANAGER
+		LLViewerRegion* region = gAgent.getRegion();
+		if (region && (region->getOwner() == gAgent.getID()))
+		{
+			btn_name = "remove_estate_manager_btn";
+		}
 	}
 
 	// enable the remove button if something is selected
-- 
cgit v1.2.3