diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-12-19 20:06:11 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-12-19 20:06:11 +0200 |
| commit | ccff36c8ee278129af3a8916bf931ab4ca14a76d (patch) | |
| tree | 99def7e14e67fa6c1d7bcb54301b19608c1eac78 /indra/newview/llviewerparcelmgr.cpp | |
| parent | cc9ad710c23ec3fff2a98ea11ee0531695b90c53 (diff) | |
MAINT-7009 backing out changeset 638ac620a500 (MAINT-4576)
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | 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 dddfb6745e..2a126c9f01 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -706,7 +706,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 |