1 files changed, 14 insertions, 1 deletions

diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 01f41ef..8064245 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -123,6 +123,7 @@ LLColor4 LLSelectMgr::sHighlightInspectColor;
 LLColor4 LLSelectMgr::sHighlightParentColor;
 LLColor4 LLSelectMgr::sHighlightChildColor;
 LLColor4 LLSelectMgr::sContextSilhouetteColor;
+std::set<LLUUID> LLSelectMgr::sObjectPropertiesFamilyRequests;
 
 static LLObjectSelection *get_null_object_selection();
 template<> 
@@ -4228,6 +4229,10 @@ void LLSelectMgr::sendListToRegions(const std::string& message_name,
 
 void LLSelectMgr::requestObjectPropertiesFamily(LLViewerObject* object)
 {
+        // Remember that we asked the properties of this object.
+        sObjectPropertiesFamilyRequests.insert(object->mID);
+        //llinfos << "Registered an ObjectPropertiesFamily request for object " << object->mID << llendl;
+
         LLMessageSystem* msg = gMessageSystem;
 
         msg->newMessageFast(_PREHASH_RequestObjectPropertiesFamily);
@@ -4419,6 +4424,15 @@ void LLSelectMgr::processObjectProperties(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;
         LLUUID creator_id;
@@ -4430,7 +4444,6 @@ void LLSelectMgr::processObjectPropertiesFamily(LLMessageSystem* msg, void** use
         LLCategory category;
         
         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_GroupID,         group_id );
         msg->getU32Fast(_PREHASH_ObjectData, _PREHASH_BaseMask,         base_mask );