diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-11-21 02:10:12 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-11-21 02:10:12 +0000 |
| commit | 78aec043f35b8b07dc0f2ba39baba737dd57555e (patch) | |
| tree | 1645378aaa34b02ffb6b4f864a4a83828f19c8ab /indra/newview/llviewerregion.cpp | |
| parent | 11d85dac83e9d58f8f6e441dcea2d1f2b661c58d (diff) | |
svn merge -r 73148:74186 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 5bfe023168..0022212399 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -870,7 +870,7 @@ public: for(int i=0; locs_it != locs.endArray(); - i++, locs_it++, agents_it++) + i++, locs_it++) { U8 x = locs_it->get("X").asInteger(), @@ -903,6 +903,10 @@ public: avatar_ids->put(agent_id); } } + if (has_agent_data) + { + agents_it++; + } } } }; |