diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-01-10 18:01:16 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-01-10 18:01:16 -0800 |
| commit | c8457f266423370e6f8e84c1b23ef95ed69a2997 (patch) | |
| tree | b292569f0e4d20e3a6fe2c71c0aff847b797c67a /indra/newview | |
| parent | 1b7bd5e2d0d8f3c8f31c037aae8f46b1377178fd (diff) | |
STORM-807 : Clean up code as discussed with Andrew
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerobject.h | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerparceloverlay.cpp | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 21de5d28be..5c1a34d555 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -226,7 +226,7 @@ public: virtual BOOL hasLightTexture() const { return FALSE; } // This method returns true if the object is over land owned by - // the agent, one of its groups, or it it encroaches and + // the agent, one of its groups, or it encroaches and // anti-encroachment is enabled bool isReturnable(); diff --git a/indra/newview/llviewerparceloverlay.cpp b/indra/newview/llviewerparceloverlay.cpp index 1207ef3340..d07e06f6a7 100644 --- a/indra/newview/llviewerparceloverlay.cpp +++ b/indra/newview/llviewerparceloverlay.cpp @@ -159,13 +159,17 @@ bool LLViewerParcelOverlay::encroachesOwned(const std::vector<LLBBox>& boxes) co S32 bottom = S32(llclamp((max.mV[VY] / PARCEL_GRID_STEP_METERS), 0.f, REGION_WIDTH_METERS - 1)); for (S32 row = top; row <= bottom; row++) + { for (S32 column = left; column <= right; column++) { U8 type = ownership(row, column); - if (PARCEL_SELF == type - || PARCEL_GROUP == type ) + if ((PARCEL_SELF == type) + || (PARCEL_GROUP == type)) + { return true; + } } + } } return false; } |