From fb2c2706aa7dde5e9a237a2a7f32965a0e7904bf Mon Sep 17 00:00:00 2001
From: elektrahesse
Date: Tue, 12 Oct 2010 12:51:41 +0200
Subject: RED-634: Fixed Name/Owner not showing up for objects.

---
 linden/indra/newview/llfloaterreporter.cpp | 1 +
 linden/indra/newview/llselectmgr.cpp       | 6 ++++++
 linden/indra/newview/llselectmgr.h         | 1 +
 3 files changed, 8 insertions(+)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llfloaterreporter.cpp b/linden/indra/newview/llfloaterreporter.cpp
index 50e2480..15f278d 100644
--- a/linden/indra/newview/llfloaterreporter.cpp
+++ b/linden/indra/newview/llfloaterreporter.cpp
@@ -361,6 +361,7 @@ void LLFloaterReporter::getObjectInfo(const LLUUID& object_id)
 			}
 			else
 			{
+				LLSelectMgr::waitForObjectResponse(mObjectID);
 				// we have to query the simulator for information 
 				// about this object
 				LLMessageSystem* msg = gMessageSystem;
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index f154de9..5a10e98 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -4297,6 +4297,12 @@ void LLSelectMgr::requestObjectPropertiesFamily(LLViewerObject* object)
 	msg->sendReliable( regionp->getHost() );
 }
 
+// static
+void LLSelectMgr::waitForObjectResponse(LLUUID id)
+{
+	if (sObjectPropertiesFamilyRequests.count(id) == 0)
+		sObjectPropertiesFamilyRequests.insert(id);
+}
 
 // static
 void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data)
diff --git a/linden/indra/newview/llselectmgr.h b/linden/indra/newview/llselectmgr.h
index c19d33d..495e61c 100644
--- a/linden/indra/newview/llselectmgr.h
+++ b/linden/indra/newview/llselectmgr.h
@@ -361,6 +361,7 @@ public:
 	~LLSelectMgr();
 
 	static void cleanupGlobals();
+	static void waitForObjectResponse(LLUUID id);
 
 	// LLEditMenuHandler interface
 	virtual BOOL canUndo() const;
-- 
cgit v1.1