diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-28 12:31:25 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-28 12:31:25 -0800 |
| commit | fc8e185fafcfea1ead8b9c064ed38d5ac65f81b6 (patch) | |
| tree | 86bd9fff165d9752c5a68af9fa87d05c20a51dc7 /indra/newview/llviewerparcelmgr.cpp | |
| parent | 3d8bd2b166b86e9fa1416d20dedc111a42c2a348 (diff) | |
| parent | d383adfc92e099676313ed930b2c1c8b1a315ae3 (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 |