From 8f89681e068365a2c352c76eb408b99784621c04 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Thu, 28 Jan 2010 20:06:57 +0200 Subject: Fixed normal bug (EXT-4610) [BSI] parcel settings icons do not match parcel settings - Changed parcel settings behavior to match viewer 1.23. --HG-- branch : product-engine --- indra/newview/llviewerparcelmgr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewerparcelmgr.cpp') diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 10a95443f1..b3450a8f36 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -706,8 +706,8 @@ bool LLViewerParcelMgr::allowAgentScripts() const bool LLViewerParcelMgr::allowAgentDamage() const { LLViewerRegion* region = gAgent.getRegion(); - return region && region->getAllowDamage() - && mAgentParcel && mAgentParcel->getAllowDamage(); + return (region && region->getAllowDamage()) + || (mAgentParcel && mAgentParcel->getAllowDamage()); } BOOL LLViewerParcelMgr::isOwnedAt(const LLVector3d& pos_global) const -- cgit v1.2.3