Merge vmm up to 3a62616f3dd8bd512fcdfd29ef033b2505b11213

This commit is contained in:
Inusaito Sayori
2015-08-01 13:07:30 -04:00
committed by Lirusaito
parent 1d6e2b4182
commit fd4155f4b6
12 changed files with 185 additions and 123 deletions

View File

@@ -451,7 +451,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
compressed_dp.unpackU32(local_id, "LocalID");
compressed_dp.unpackU8(pcode, "PCode");
}
else
else //OUT_TERSE_IMPROVED
{
compressed_dp.unpackU32(local_id, "LocalID");
getUUIDFromLocal(fullid,
@@ -460,7 +460,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
gMessageSystem->getSenderPort());
if (fullid.isNull())
{
// LL_WARNS() << "update for unknown localid " << local_id << " host " << gMessageSystem->getSender() << ":" << gMessageSystem->getSenderPort() << LL_ENDL;
LL_DEBUGS() << "update for unknown localid " << local_id << " host " << gMessageSystem->getSender() << ":" << gMessageSystem->getSenderPort() << LL_ENDL;
mNumUnknownUpdates++;
}
}