ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'opensim:master' into master

Browse Source
This commit is contained in:
Adil El Farissi
2024-06-15 22:33:50 +00:00
committed by GitHub
parent 3bcc96e42d 644af5093e
commit f397fc36a4
4 changed files with 16 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/RegionSettings.cs
View File

@@ -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; }
}

26
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@@ -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;

1
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@@ -13475,6 +13475,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
}
}
ret |= (uint)(ViewerFlags & (ViewerFlags.SentTPBR));
ViewerFlags = (ViewerFlags)ret;
return ret;
}

19
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -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();