diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 09:15:57 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 09:15:57 -0400 |
| commit | 6fcc9a0eae892a8bfc1079e100a37da7f781330b (patch) | |
| tree | d8c5cb3ab9aaf52cf4ffa2bed92ff66d465fa2b4 /indra/newview/llviewerparceloverlay.h | |
| parent | c3da5bb12d1c7c173929433589a4068555791bea (diff) | |
| parent | bb3c36f5cbc0c3b542045fd27255eee24e03da22 (diff) | |
Merge branch 'main' into release/luau-scripting for Maint X release.
Diffstat (limited to 'indra/newview/llviewerparceloverlay.h')
| -rw-r--r-- | indra/newview/llviewerparceloverlay.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/indra/newview/llviewerparceloverlay.h b/indra/newview/llviewerparceloverlay.h index 92aa70e4dd..7587dbb826 100644 --- a/indra/newview/llviewerparceloverlay.h +++ b/indra/newview/llviewerparceloverlay.h @@ -68,7 +68,7 @@ public: F32 getOwnedRatio() const; // Returns the number of vertices drawn - S32 renderPropertyLines(); + void renderPropertyLines(); void renderPropertyLinesOnMinimap(F32 scale_pixels_per_meter, const F32* parcel_outline_color); U8 ownership( const LLVector3& pos) const; @@ -92,12 +92,7 @@ private: U8 parcelFlags(S32 row, S32 col, U8 flags) const; - void addPropertyLine(std::vector<LLVector3>& vertex_array, - std::vector<LLColor4U>& color_array, - std::vector<LLVector2>& coord_array, - const F32 start_x, const F32 start_y, - const U32 edge, - const LLColor4U& color); + void addPropertyLine(F32 start_x, F32 start_y, F32 dx, F32 dy, F32 tick_dx, F32 tick_dy, const LLColor4U& color); void updateOverlayTexture(); void updatePropertyLines(); @@ -121,9 +116,13 @@ private: LLFrameTimer mTimeSinceLastUpdate; S32 mOverlayTextureIdx; - S32 mVertexCount; - F32* mVertexArray; - U8* mColorArray; + struct Edge + { + std::vector<LLVector3> vertices; + LLColor4U color; + }; + + std::vector<Edge> mEdges; }; #endif |