ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +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-07 21:03:53 +00:00
committed by GitHub
parent 5a5ba6c021 ecdc979687
commit 6ab23c8d6b
56 changed files with 855 additions and 6431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
View File

@@ -101,9 +101,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
public virtual void PostInitialise()
{
if (!m_Enabled)
return;
}
public virtual void RegionLoaded(Scene scene)

2
OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
View File

@@ -152,7 +152,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
return;
}
//pass this in as degrees now, convert to radians later during actual work phase
rotation = Util.Clamp<float>(rotation, -359f, 359f);
rotation = Math.Clamp(rotation, -359f, 359f);
});
options.Add("rotation-center=", delegate(string v)
{

8
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
View File

@@ -229,7 +229,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
public void setEstateTerrainBaseTexture(int level, UUID texture)
{
SetEstateTerrainBaseTexture(null, level, texture);
sendRegionHandshakeToAll();
}
public void setEstateTerrainTextureHeights(int corner, float lowValue, float highValue)
@@ -556,11 +555,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
case 3:
Scene.RegionInfo.RegionSettings.TerrainTexture4 = texture;
break;
default:
return;
}
Scene.RegionInfo.RegionSettings.Save();
TriggerRegionInfoChange();
SendRegionInfoPacketToAll();
sendRegionHandshakeToAll();
}
public void SetEstateTerrainTextureHeights(IClientAPI client, int corner, float lowValue, float highValue)
@@ -583,12 +584,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
Scene.RegionInfo.RegionSettings.Elevation1NE = lowValue;
Scene.RegionInfo.RegionSettings.Elevation2NE = highValue;
break;
default:
return;
}
Scene.RegionInfo.RegionSettings.Save();
TriggerRegionInfoChange();
sendRegionHandshakeToAll();
// sendRegionInfoPacketToAll();
}
private void HandleCommitEstateTerrainTextureRequest(IClientAPI remoteClient)

6
OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs
View File

@@ -232,9 +232,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
detailTexture[t].UnlockBits(bmdata);
detailTexture[t].Dispose();
mapColorsRed[t] = (byte)Util.Clamp(cR / npixeis, 0 , 255);
mapColorsGreen[t] = (byte)Util.Clamp(cG / npixeis, 0 , 255);
mapColorsBlue[t] = (byte)Util.Clamp(cB / npixeis, 0 , 255);
mapColorsRed[t] = (byte)Math.Clamp(cR / npixeis, 0 , 255);
mapColorsGreen[t] = (byte)Math.Clamp(cG / npixeis, 0 , 255);
mapColorsBlue[t] = (byte)Math.Clamp(cB / npixeis, 0 , 255);
}
}
else