diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2014-10-15 19:34:13 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2014-10-15 19:34:13 +0300 |
| commit | 94ac0064354594de8adbb99084029c8b4027b2f6 (patch) | |
| tree | 5b4606736e20c7f7efa09cb88831ad9a13a90daf /indra/newview/llviewerparcelmgr.cpp | |
| parent | 99bf150059fea3f0856e376fba66e5f9d6a4abe7 (diff) | |
MAINT-4576 FIXED Damage Icon always displays regardless of land setting.
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rwxr-xr-x | indra/newview/llviewerparcelmgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 2f4365036c..d574dec11d 100755 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -705,7 +705,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()); } BOOL LLViewerParcelMgr::isOwnedAt(const LLVector3d& pos_global) const |