From 46fa98419c59a0cc7f07fbb37751da00503ff3ba Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Tue, 17 Nov 2015 05:54:40 -0500 Subject: [PATCH] Using pointers instead of references is so uncool. --- indra/newview/llviewerregion.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index f4a01b0fb..06bb06d39 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1286,10 +1286,10 @@ public: S32 target_index = input["body"]["Index"][0]["Prey"].asInteger(); S32 you_index = input["body"]["Index"][0]["You" ].asInteger(); - std::vector* avatar_locs = ®ion->mMapAvatars; - std::vector* avatar_ids = ®ion->mMapAvatarIDs; - avatar_locs->clear(); - avatar_ids->clear(); + std::vector& avatar_locs = region->mMapAvatars; + std::vector& avatar_ids = region->mMapAvatarIDs; + 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 +1329,13 @@ 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); } } if (has_agent_data)