ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +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; }
}