diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-30 18:19:56 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-30 18:19:56 +0300 |
| commit | 3e23c04c9b633f947faf8c7c11ed73ad78de8d3c (patch) | |
| tree | a65e8b51b8622750038e93799274539329c66343 /indra/newview/llworld.cpp | |
| parent | c73dcb079991bad12458386274cec409013ad76b (diff) | |
| parent | e1517318c58d6796b5566d5cf96c02474fd7376e (diff) | |
Merge from default branch
--HG--
branch : product-engine
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 19f303ab88..0b63f5efbd 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -1209,7 +1209,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) { |