diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-30 13:15:36 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-30 13:15:36 +0100 |
| commit | 61774546f0b260c18c5308143a9c3d02a5e5245e (patch) | |
| tree | 4566b4f91c2e02956143647067ae642570bb907a /indra/newview/llworld.cpp | |
| parent | ccd5b9e2f3f1139814a63d9db03c3671c249930c (diff) | |
| parent | e1517318c58d6796b5566d5cf96c02474fd7376e (diff) | |
HUGE merge from viewer-trunk. Many conflicts resolved.
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 63f0357ea0..c7148f8826 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -1211,7 +1211,7 @@ static LLVector3d unpackLocalToGlobalPosition(U32 compact_local, const LLVector3 return pos_global; } -void LLWorld::getAvatars(std::vector<LLUUID>* avatar_ids, std::vector<LLVector3d>* positions, const LLVector3d& relative_to, F32 radius) const +void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positions, const LLVector3d& relative_to, F32 radius) const { if(avatar_ids != NULL) { |