diff options
| author | Richard Linden <none@none> | 2013-07-30 19:13:45 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-07-30 19:13:45 -0700 |
| commit | a2e22732f195dc075a733c79f15156752f522a43 (patch) | |
| tree | c708db3a28ae578b3b6d8f1cc94935937efd9a1e /indra/newview/llviewerregion.h | |
| parent | 19f7fb6ccce52224cc067e496d1480191badb165 (diff) | |
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rwxr-xr-x | indra/newview/llviewerregion.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index 29483662e8..cc314dc43b 100755 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -32,7 +32,6 @@ #include <string> #include <boost/signals2.hpp> -#include "lldarray.h" #include "llwind.h" #include "v3dmath.h" #include "llstring.h" @@ -407,8 +406,8 @@ public: // messaging system in which the previous message only sends and parses the // positions stored in the first array so they're maintained separately until // we stop supporting the old CoarseLocationUpdate message. - LLDynamicArray<U32> mMapAvatars; - LLDynamicArray<LLUUID> mMapAvatarIDs; + std::vector<U32> mMapAvatars; + std::vector<LLUUID> mMapAvatarIDs; static BOOL sVOCacheCullingEnabled; //vo cache culling enabled or not. private: |