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

Reliable picking of objects in AR floater.

Browse Source 
Backport from 2.4 - removes a check of whether picker really expects to
receive properties for an object, which fails when you pick a non-root
prim. From source inspection, shouldn't really affect anything else
adversely.
This commit is contained in:
Siana Gearz
2011-01-07 00:09:06 +01:00
parent a919514692
commit 16b6ebf7de
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llselectmgr.cpp
View File

@@ -4482,18 +4482,8 @@ void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data
// static // static
void LLSelectMgr::processObjectPropertiesFamily(LLMessageSystem* msg, void** user_data) void LLSelectMgr::processObjectPropertiesFamily(LLMessageSystem* msg, void** user_data)
{ {
LLUUID id;
msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_ObjectID, id);
if (sObjectPropertiesFamilyRequests.count(id) == 0)
{
// This reply is not for us.
return;
}
// We got the reply, so remove the object from the list of pending requests
sObjectPropertiesFamilyRequests.erase(id);
//llinfos << "Got ObjectPropertiesFamily reply for object " << id << llendl;
U32 request_flags; U32 request_flags;
LLUUID id;
LLUUID creator_id; LLUUID creator_id;
LLUUID owner_id; LLUUID owner_id;
LLUUID group_id; LLUUID group_id;
@@ -4503,6 +4493,7 @@ void LLSelectMgr::processObjectPropertiesFamily(LLMessageSystem* msg, void** use
LLCategory category; LLCategory category;
msg->getU32Fast(_PREHASH_ObjectData, _PREHASH_RequestFlags, request_flags ); msg->getU32Fast(_PREHASH_ObjectData, _PREHASH_RequestFlags, request_flags );
msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_ObjectID, id );
msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_OwnerID, owner_id ); msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_OwnerID, owner_id );
msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_GroupID, group_id ); msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_GroupID, group_id );
msg->getU32Fast(_PREHASH_ObjectData, _PREHASH_BaseMask, base_mask ); msg->getU32Fast(_PREHASH_ObjectData, _PREHASH_BaseMask, base_mask );
@@ -4513,6 +4504,8 @@ void LLSelectMgr::processObjectPropertiesFamily(LLMessageSystem* msg, void** use
sale_info.unpackMessage(msg, _PREHASH_ObjectData); sale_info.unpackMessage(msg, _PREHASH_ObjectData);
category.unpackMessage(msg, _PREHASH_ObjectData); category.unpackMessage(msg, _PREHASH_ObjectData);
llinfos << "Got ObjectPropertiesFamily reply for object " << id << llendl;
LLUUID last_owner_id; LLUUID last_owner_id;
msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_LastOwnerID, last_owner_id ); msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_LastOwnerID, last_owner_id );