Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git

Browse Source
This commit is contained in:
Shyotl
2016-04-03 13:22:36 -05:00
parent bd26be78a9 9fee430d7d
commit 9214750a90
596 changed files with 16286 additions and 34539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llviewerregion.cpp
View File

@@ -1286,10 +1286,11 @@ public:
S32 target_index = input["body"]["Index"][0]["Prey"].asInteger();
S32 you_index = input["body"]["Index"][0]["You" ].asInteger();
std::vector<U32>* avatar_locs = &region->mMapAvatars;
std::vector<LLUUID>* avatar_ids = &region->mMapAvatarIDs;
avatar_locs->clear();
avatar_ids->clear();
std::vector<U32>& avatar_locs = region->mMapAvatars;
std::vector<LLUUID>& avatar_ids = region->mMapAvatarIDs;
std::list<LLUUID> map_avids(avatar_ids.begin(), avatar_ids.end());
avatar_locs.clear();
avatar_ids.clear();
//LL_INFOS() << "coarse locations agent[0] " << input["body"]["AgentData"][0]["AgentID"].asUUID() << LL_ENDL;
//LL_INFOS() << "my agent id = " << gAgent.getID() << LL_ENDL;
@@ -1329,13 +1330,14 @@ public:
pos |= y;
pos <<= 8;
pos |= z;
avatar_locs->push_back(pos);
avatar_locs.push_back(pos);
//LL_INFOS() << "next pos: " << x << "," << y << "," << z << ": " << pos << LL_ENDL;
if(has_agent_data) // for backwards compatibility with old message format
{
LLUUID agent_id(agents_it->get("AgentID").asUUID());
//LL_INFOS() << "next agent: " << agent_id.asString() << LL_ENDL;
avatar_ids->push_back(agent_id);
avatar_ids.push_back(agent_id);
map_avids.remove(agent_id);
}
}
if (has_agent_data)
@@ -1343,6 +1345,12 @@ public:
agents_it++;
}
}
if (LLFloaterAvatarList::instanceExists())
{
LLFloaterAvatarList& inst(LLFloaterAvatarList::instance());
inst.updateAvatarList(region);
inst.expireAvatarList(map_avids);
}
}
};