diff options
| author | Richard Linden <none@none> | 2013-07-30 19:15:46 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-07-30 19:15:46 -0700 |
| commit | 5762c1d0d727f0050aefe7126ab2d5280bebfb9b (patch) | |
| tree | 78bdcc931460dfc45d35cd1707ddf1afdf049a2e /indra/newview/llviewerparceloverlay.h | |
| parent | 4cca9ba279f908f206fa5e32adccf1038f05cc7f (diff) | |
| parent | 910874a7e32bdfc456474e2d0ee84d190be3011e (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llviewerparceloverlay.h')
| -rwxr-xr-x | indra/newview/llviewerparceloverlay.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llviewerparceloverlay.h b/indra/newview/llviewerparceloverlay.h index 7445d5bf1d..14a2af5354 100755 --- a/indra/newview/llviewerparceloverlay.h +++ b/indra/newview/llviewerparceloverlay.h @@ -31,7 +31,6 @@ // One of these structures per region. #include "llbbox.h" -#include "lldarray.h" #include "llframetimer.h" #include "lluuid.h" #include "llviewertexture.h" @@ -88,9 +87,9 @@ private: U8 ownership(S32 row, S32 col) const { return 0x7 & mOwnership[row * mParcelGridsPerEdge + col]; } - void addPropertyLine(LLDynamicArray<LLVector3, 256>& vertex_array, - LLDynamicArray<LLColor4U, 256>& color_array, - LLDynamicArray<LLVector2, 256>& coord_array, + 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); |