diff options
| author | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-01-28 20:06:57 +0200 |
|---|---|---|
| committer | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-01-28 20:06:57 +0200 |
| commit | 8f89681e068365a2c352c76eb408b99784621c04 (patch) | |
| tree | 5981260138be75d6c33dfdad98b55a19aa3ae9d0 /indra/newview/llviewerparcelmgr.cpp | |
| parent | da08cc05af85ac334cabd943a5d9fcbcaa1500b6 (diff) | |
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
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 |