From 58f74dceb36c9ba2f488d581afd35879df54e71e Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 14 Jun 2024 21:59:56 +0100 Subject: [PATCH 1/3] do not reset SentTPBR state --- OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index b55e02f4d5..5898370b6e 100755 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -13475,6 +13475,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } } } + ret |= (uint)(ViewerFlags & (ViewerFlags.SentTPBR)); ViewerFlags = (ViewerFlags)ret; return ret; } From 8e874d97c5a41c76a347d02283ebbbe4a5c2db99 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 15 Jun 2024 00:31:25 +0100 Subject: [PATCH 2/3] if at load all pbt terrain id are zero reset all to non pbr ids (so on version update they look the same automaticly) --- OpenSim/Framework/RegionSettings.cs | 8 ++++---- OpenSim/Region/Framework/Scenes/Scene.cs | 19 +++++++++++-------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs index 7b74a1f4e0..6ac75c30cf 100644 --- a/OpenSim/Framework/RegionSettings.cs +++ b/OpenSim/Framework/RegionSettings.cs @@ -263,28 +263,28 @@ namespace OpenSim.Framework public UUID TerrainPBR1 { get { return m_TerrainPBR1; } - set { m_TerrainPBR1 = value.IsZero() ? DEFAULT_TERRAIN_PBR_1 : value; } + set { m_TerrainPBR1 = value;} } private UUID m_TerrainPBR2 = UUID.Zero; public UUID TerrainPBR2 { get { return m_TerrainPBR2; } - set { m_TerrainPBR2 = value.IsZero() ? DEFAULT_TERRAIN_PBR_2 : value; } + set { m_TerrainPBR2 = value; } } private UUID m_TerrainPBR3 = UUID.Zero; public UUID TerrainPBR3 { get { return m_TerrainPBR3; } - set { m_TerrainPBR3 = value.IsZero() ? DEFAULT_TERRAIN_PBR_3 : value; } + set { m_TerrainPBR3 = value; } } private UUID m_TerrainPBR4 = UUID.Zero; public UUID TerrainPBR4 { get { return m_TerrainPBR4; } - set { m_TerrainPBR4 = value.IsZero() ? DEFAULT_TERRAIN_PBR_4 : value; } + set { m_TerrainPBR4 = value; } } diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 74df9f951e..04d5ce160d 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -856,14 +856,17 @@ namespace OpenSim.Region.Framework.Scenes updatedTerrainTextures = true; } - if (rs.TerrainPBR1.IsZero()) - rs.TerrainPBR1 = RegionSettings.DEFAULT_TERRAIN_PBR_1; - if (rs.TerrainPBR2.IsZero()) - rs.TerrainPBR2 = RegionSettings.DEFAULT_TERRAIN_PBR_2; - if (rs.TerrainPBR3.IsZero()) - rs.TerrainPBR3 = RegionSettings.DEFAULT_TERRAIN_PBR_3; - if (rs.TerrainPBR4.IsZero()) - rs.TerrainPBR4 = RegionSettings.DEFAULT_TERRAIN_PBR_4; + if (rs.TerrainPBR1.IsZero() && + rs.TerrainPBR2.IsZero() && + rs.TerrainPBR3.IsZero() && + rs.TerrainPBR4.IsZero()) + { + rs.TerrainPBR1 = rs.TerrainTexture1; + rs.TerrainPBR2 = rs.TerrainTexture2; + rs.TerrainPBR3 = rs.TerrainTexture3; + rs.TerrainPBR4 = rs.TerrainTexture4; + updatedTerrainTextures = true; + } if (updatedTerrainTextures) rs.Save(); From 644af5093e1b3e94bb30678a8136cc349390d94d Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 15 Jun 2024 05:30:22 +0100 Subject: [PATCH 3/3] remove duplicated cap service --- .../Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 3f1c22b66c..39e826b3c3 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs @@ -263,9 +263,6 @@ namespace OpenSim.Region.ClientStack.Linden m_HostCapsObj.RegisterSimpleHandler("UpdateScriptTaskInventory", oreq, true); //legacy } - m_HostCapsObj.RegisterSimpleHandler("UpdateAgentInformation", - new SimpleStreamHandler(GetNewCapPath(), UpdateAgentInformation)); - m_HostCapsObj.RegisterSimpleHandler("CopyInventoryFromNotecard", new SimpleOSDMapHandler("POST", GetNewCapPath(), CopyInventoryFromNotecard)); @@ -1895,29 +1892,6 @@ namespace OpenSim.Region.ClientStack.Linden httpResponse.StatusCode = (int)HttpStatusCode.OK; } - public void UpdateAgentInformation(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) - { - if (httpRequest.HttpMethod != "POST") - { - httpResponse.StatusCode = (int)HttpStatusCode.NotFound; - return; - } - - // this is wrong now ignores request and sends same result for all - // we don't store and worse don't use that to filter contents - - // OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); - OSDMap resp = new OSDMap(); - - OSDMap accessPrefs = new OSDMap(); - accessPrefs["max"] = "A"; - - resp["access_prefs"] = accessPrefs; - - httpResponse.RawBuffer = OSDParser.SerializeLLSDXmlBytes(resp); - httpResponse.StatusCode = (int)HttpStatusCode.OK; - } - public bool OSDMapTOVector3(OSDMap map, out Vector3 v) { v = Vector3.Zero;