PE merge

1 files changed, 58 insertions, 9 deletions

diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index 050cfcc3d9..0e93e28f2d 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -153,6 +153,23 @@ private:
 	LLLocationInputCtrl* mInput;
 };
 
+class LLParcelChangeObserver : public LLParcelObserver
+{
+public:
+	LLParcelChangeObserver(LLLocationInputCtrl* input) : mInput(input) {}
+
+private:
+	/*virtual*/ void changed()
+	{
+		if (mInput)
+		{
+			mInput->refreshParcelIcons();
+		}
+	}
+
+	LLLocationInputCtrl* mInput;
+};
+
 //============================================================================
 
 
@@ -335,7 +352,10 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 	mAddLandmarkObserver	= new LLAddLandmarkObserver(this);
 	gInventory.addObserver(mRemoveLandmarkObserver);
 	gInventory.addObserver(mAddLandmarkObserver);
-	
+
+	mParcelChangeObserver = new LLParcelChangeObserver(this);
+	LLViewerParcelMgr::getInstance()->addObserver(mParcelChangeObserver);
+
 	mAddLandmarkTooltip = LLTrans::getString("LocationCtrlAddLandmarkTooltip");
 	mEditLandmarkTooltip = LLTrans::getString("LocationCtrlEditLandmarkTooltip");
 	getChild<LLView>("Location History")->setToolTip(LLTrans::getString("LocationCtrlComboBtnTooltip"));
@@ -349,6 +369,9 @@ LLLocationInputCtrl::~LLLocationInputCtrl()
 	delete mRemoveLandmarkObserver;
 	delete mAddLandmarkObserver;
 
+	LLViewerParcelMgr::getInstance()->removeObserver(mParcelChangeObserver);
+	delete mParcelChangeObserver;
+
 	mParcelMgrConnection.disconnect();
 	mLocationHistoryConnection.disconnect();
 }
@@ -673,15 +696,41 @@ void LLLocationInputCtrl::refreshParcelIcons()
 	if (show_properties)
 	{
 		LLViewerParcelMgr* vpm = LLViewerParcelMgr::getInstance();
+
+		LLViewerRegion* agent_region = gAgent.getRegion();
 		LLParcel* agent_parcel = vpm->getAgentParcel();
-		bool allow_buy      = vpm->canAgentBuyParcel( agent_parcel, false);
-		bool allow_voice	= vpm->allowAgentVoice();
-		bool allow_fly		= vpm->allowAgentFly();
-		bool allow_push		= vpm->allowAgentPush();
-		bool allow_build	= agent_parcel && agent_parcel->getAllowModify(); // true when anyone is allowed to build. See EXT-4610.
-		bool allow_scripts	= vpm->allowAgentScripts();
-		bool allow_damage	= vpm->allowAgentDamage();
-		
+		if (!agent_region || !agent_parcel)
+			return;
+
+		LLParcel* current_parcel;
+		LLViewerRegion* selection_region = vpm->getSelectionRegion();
+		LLParcel* selected_parcel = vpm->getParcelSelection()->getParcel();
+
+		// If agent is in selected parcel we use its properties because
+		// they are updated more often by LLViewerParcelMgr than agent parcel properties.
+		// See LLViewerParcelMgr::processParcelProperties().
+		// This is needed to reflect parcel restrictions changes without having to leave
+		// the parcel and then enter it again. See EXT-2987
+		if (selected_parcel && selected_parcel->getLocalID() == agent_parcel->getLocalID()
+				&& selection_region == agent_region)
+		{
+			current_parcel = selected_parcel;
+		}
+		else
+		{
+			current_parcel = agent_parcel;
+		}
+
+		bool allow_buy      = vpm->canAgentBuyParcel(current_parcel, false);
+		bool allow_voice	= agent_region->isVoiceEnabled() && current_parcel->getParcelFlagAllowVoice();
+		bool allow_fly		= !agent_region->getBlockFly() && current_parcel->getAllowFly();
+		bool allow_push		= !agent_region->getRestrictPushObject() && !current_parcel->getRestrictPushObject();
+		bool allow_build	= current_parcel->getAllowModify(); // true when anyone is allowed to build. See EXT-4610.
+		bool allow_scripts	= !(agent_region->getRegionFlags() & REGION_FLAGS_SKIP_SCRIPTS) &&
+							  !(agent_region->getRegionFlags() & REGION_FLAGS_ESTATE_SKIP_SCRIPTS) &&
+							  current_parcel->getAllowOtherScripts();
+		bool allow_damage	= agent_region->getAllowDamage() || current_parcel->getAllowDamage();
+
 		// Most icons are "block this ability"
 		mForSaleBtn->setVisible(allow_buy);
 		mParcelIcon[VOICE_ICON]->setVisible(   !allow_voice );