From bd1e32546fb46f6c7c50e74dbb2eb96347c8b4ff Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 25 Jan 2026 21:05:54 +0000 Subject: [PATCH] cosmetics --- OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 10 ++-------- OpenSim/Region/Framework/Scenes/SceneGraph.cs | 4 +--- OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 4 ++-- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 09683c6fc3..9333755e23 100755 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -3214,16 +3214,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP AvatarPropertiesReplyPacket avatarReply = (AvatarPropertiesReplyPacket)PacketPool.Instance.GetPacket(PacketType.AvatarPropertiesReply); avatarReply.AgentData.AgentID = m_agentId; avatarReply.AgentData.AvatarID = avatarID; - if (aboutText != null) - avatarReply.PropertiesData.AboutText = Util.StringToBytes1024(aboutText); - else - avatarReply.PropertiesData.AboutText = Utils.EmptyBytes; + avatarReply.PropertiesData.AboutText = aboutText == null ? [] : Util.StringToBytes1024(aboutText); avatarReply.PropertiesData.BornOn = Util.StringToBytes256(bornOn); avatarReply.PropertiesData.CharterMember = membershipType; - if (flAbout != null) - avatarReply.PropertiesData.FLAboutText = Util.StringToBytes256(flAbout); - else - avatarReply.PropertiesData.FLAboutText = Utils.EmptyBytes; + avatarReply.PropertiesData.FLAboutText = flAbout == null ? [] : Util.StringToBytes256(flAbout); avatarReply.PropertiesData.Flags = flags; avatarReply.PropertiesData.FLImageID = flImageID; avatarReply.PropertiesData.ImageID = imageID; diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 5a4334e9ff..81b38bf98a 100755 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs @@ -373,11 +373,9 @@ namespace OpenSim.Region.Framework.Scenes /// protected internal bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates) { - bool ret = AddSceneObject(sceneObject, attachToBackup, sendClientUpdates); - // Ensure that we persist this new scene object if it's not an - // attachment + // Ensure that we persist this new scene object if it's not an attachment if (attachToBackup) sceneObject.HasGroupChanged = true; diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 49292efec1..3dfe562887 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -4046,11 +4046,11 @@ namespace OpenSim.Region.Framework.Scenes RootPart.ScheduleFullUpdate(); } - public void SetPartsInventoryChanged() + public void SetPartsInventoryChanged(bool force = true) { SceneObjectPart[] parts = m_parts.GetArray(); for (int i = 0; i < parts.Length; i++) - parts[i].Inventory?.ForceInventoryPersistence(); + parts[i].Inventory?.ForceInventoryPersistence(force); } public void UpdatePermissions(UUID AgentID, byte field, uint localID,