From 197e6012170deb2b75171a80f5a8ab593360bc82 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 4 Dec 2022 16:52:20 +0100
Subject: [PATCH] Unscrew broken avatar properties request in Havok builds
 caused by check for a cap that isn't used in the end anyway

---
 indra/newview/llavatarpropertiesprocessor.cpp | 34 ++-----------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/indra/newview/llavatarpropertiesprocessor.cpp b/indra/newview/llavatarpropertiesprocessor.cpp
index 699f7d54b5..8750eb9f91 100644
--- a/indra/newview/llavatarpropertiesprocessor.cpp
+++ b/indra/newview/llavatarpropertiesprocessor.cpp
@@ -147,16 +147,14 @@ void LLAvatarPropertiesProcessor::sendRequest(const LLUUID& avatar_id, EAvatarPr
 
 void LLAvatarPropertiesProcessor::sendGenericRequest(const LLUUID& avatar_id, EAvatarProcessorType type, const std::string &method)
 {
-// <FS:Beq> First run at profile behaviour fix for OpenSim
-#ifdef OPENSIM // maintain legacy behaviour for now
+	// <FS:Beq> First run at profile behaviour fix for OpenSim
 	// Suppress duplicate requests while waiting for a response from the network
 	if (isPendingRequest(avatar_id, type))
 	{
 		// waiting for a response, don't re-request
 		return;
 	}
-#endif //OPENSIM
-// </FS:Beq>
+	// </FS:Beq>
 	// indicate we're going to make a request
 	addPendingRequest(avatar_id, type);
 
@@ -190,34 +188,8 @@ void LLAvatarPropertiesProcessor::initAgentProfileCapRequest(const LLUUID& avata
 }
 void LLAvatarPropertiesProcessor::sendAvatarPropertiesRequest(const LLUUID& avatar_id)
 {
-// <FS:Beq> maintian legacy behaviour for OpenSim
-	if(!gAgent.getRegionCapability("AgentProfile").empty())
-	{
-// </FS:Beq>
-    	sendRequest(avatar_id, APT_PROPERTIES, "AvatarPropertiesRequest");
-	}
-// <FS:Beq> maintian legacy behaviour for OpenSim
-#ifdef OPENSIM
-	else
-	{
-		// this is the startup state when send_complete_agent_movement() message is sent.
-		// Before this, the AvatarPropertiesRequest message  
-		// won't work so don't bother trying
-		if (LLStartUp::getStartupState() <= STATE_AGENT_SEND)
-		{
-			return;
-		}
-
-		if (isPendingRequest(avatar_id, APT_PROPERTIES))
-		{
-			// waiting for a response, don't re-request
-			return;
-		}
-		sendAvatarPropertiesRequestMessage(avatar_id);
-	}	
-#endif
+    sendRequest(avatar_id, APT_PROPERTIES, "AvatarPropertiesRequest");
 }
-// </FS:Beq>
 
 void LLAvatarPropertiesProcessor::sendAvatarPicksRequest(const LLUUID& avatar_id)
 {