From 11cb8b6ed0967208520b2330f52816a173acaf28 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 16 Mar 2025 21:31:53 +0000 Subject: [PATCH] cosmitics; allow to wear 3 animesh objects --- OpenSim/Framework/Constants.cs | 1 + .../Caps/EventQueue/EventQueueGetModule.cs | 34 +------------------ .../Linden/Caps/SimulatorFeaturesModule.cs | 2 +- 3 files changed, 3 insertions(+), 34 deletions(-) diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs index 1551ac45f4..967563bc8e 100644 --- a/OpenSim/Framework/Constants.cs +++ b/OpenSim/Framework/Constants.cs @@ -32,6 +32,7 @@ namespace OpenSim.Framework public class Constants { public const int MaxAgentAttachments = 38; + public const int MaxAgentAnimatedObjectAttachments = 3; public const int MaxAgentGroups = 60; public const int MaxEstateAccessIds = 500; diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index 3852296bbb..61392e10ca 100755 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs @@ -199,9 +199,7 @@ namespace OpenSim.Region.ClientStack.Linden { lock (queues) { - if (queues.TryGetValue(agentId, out Queue queue)) - return queue; - return null; + return queues.TryGetValue(agentId, out Queue queue) ? queue : null; } } @@ -232,36 +230,6 @@ namespace OpenSim.Region.ClientStack.Linden return true; } - //legacy - /* - public bool Enqueue(string ev, UUID avatarID) - { - //m_log.DebugFormat("[EVENTQUEUE]: Enqueuing event for {0} in region {1}", avatarID, m_scene.RegionInfo.RegionName); - try - { - Queue queue = GetQueue(avatarID); - if (queue != null) - { - byte[] evData = Util.UTF8NBGetbytes(ev); - lock (queue) - queue.Enqueue(evData); - } - else - { - m_log.WarnFormat( - "[EVENTQUEUE]: (Enqueue) No queue found for agent {0} in region {1}", - avatarID, m_scene.Name); - } - } - catch (NullReferenceException e) - { - m_log.Error("[EVENTQUEUE] Caught exception: " + e); - return false; - } - return true; - } - */ - public bool Enqueue(byte[] evData, UUID avatarID) { //m_log.DebugFormat("[EVENTQUEUE]: Enqueuing event for {0} in region {1}", avatarID, m_scene.RegionInfo.RegionName); diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs index b23b4136e8..e6015ecc20 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs @@ -136,7 +136,7 @@ namespace OpenSim.Region.ClientStack.Linden m_features["AnimatedObjects"] = new OSDMap() { ["AnimatedObjectMaxTris"] = OSD.FromInteger(150000), - ["MaxAgentAnimatedObjectAttachments"] = OSD.FromInteger(2) + ["MaxAgentAnimatedObjectAttachments"] = OSD.FromInteger(Constants.MaxAgentAnimatedObjectAttachments) }; m_features["BakesOnMeshEnabled"] = true;