ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

very useless changes

Browse Source
This commit is contained in:
UbitUmarov
2025-06-25 02:22:28 +01:00
parent f1d84b7866
commit 0d71b6d871
78 changed files with 123 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,9 +147,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
if (options.ContainsKey("all") && (bool)options["all"])
MultiRegionFormat = true;
if (options.ContainsKey("noassets") && (bool)options["noassets"])
SaveAssets = false;
if (options.TryGetValue("checkPermissions", out Object temp))
FilterContent = (string)temp;

1
OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
View File

@@ -137,7 +137,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
foreach (KeyValuePair<UUID, sbyte> kvp in m_uuids)
{
string thiskey = kvp.Key.ToString();
try
{

10
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@@ -2322,7 +2322,7 @@ namespace OpenSim.Region.CoreModules.World.Land
land.LandData.AuthBuyerID = UUID.Zero;
land.LandData.Category = ParcelCategory.None;
land.LandData.ClaimDate = Util.UnixTimeSinceEpoch();
land.LandData.Description = String.Empty;
land.LandData.Description = string.Empty;
land.LandData.Dwell = 0;
land.LandData.Flags = (uint)ParcelFlags.AllowFly | (uint)ParcelFlags.AllowLandmark |
(uint)ParcelFlags.AllowAPrimitiveEntry |
@@ -2337,9 +2337,9 @@ namespace OpenSim.Region.CoreModules.World.Land
land.LandData.MediaID = UUID.Zero;
land.LandData.MediaLoop = false;
land.LandData.MediaType = "none/none";
land.LandData.MediaURL = String.Empty;
land.LandData.MediaURL = string.Empty;
land.LandData.MediaWidth = 0;
land.LandData.MusicURL = String.Empty;
land.LandData.MusicURL = string.Empty;
land.LandData.ObscureMedia = false;
land.LandData.ObscureMusic = false;
land.LandData.OtherCleanTime = 0;
@@ -2376,11 +2376,11 @@ namespace OpenSim.Region.CoreModules.World.Land
private void ClientOnSimWideDeletes(IClientAPI client, UUID agentID, int flags, UUID targetID)
{
if(!((Scene)client.Scene).TryGetScenePresence(client.AgentId, out ScenePresence SP))
if(!((Scene)client.Scene).TryGetScenePresence(client.AgentId, out ScenePresence sp))
return;
List<SceneObjectGroup> returns = new();
if (SP.GodController.UserLevel != 0)
if (sp.GodController.UserLevel != 0)
{
if (flags == 0) //All parcels, scripted or not
{

1
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@@ -1779,7 +1779,6 @@ namespace OpenSim.Region.CoreModules.World.Land
{
try
{
foreach (SceneObjectGroup obj in primsOverMe)
{
if (!ownersAndCount.ContainsKey(obj.OwnerID))

3
OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
View File

@@ -93,7 +93,6 @@ namespace OpenSim.Region.CoreModules.World.LightShare
Enabled = true;
m_log.InfoFormat("[{0}]: Module is enabled.", Name);
}
@@ -777,7 +776,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
Name, m_scene.Name, e.Message, e.StackTrace);
success = false;
fail_reason = String.Format("Environment Set for region {0} has failed, settings not saved.", m_scene.Name);
fail_reason = string.Format("Environment Set for region {0} has failed, settings not saved.", m_scene.Name);
}
Error:

1
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
View File

@@ -122,6 +122,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return m_friendsModule;
}
}
private IGroupsModule m_groupsModule;
private IGroupsModule GroupsModule
{

2
OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
View File

@@ -222,7 +222,6 @@ namespace OpenSim.Region.CoreModules.World.Sound
return;
if (!ssp.ParcelAllowThisAvatarSounds)
return;
radius = MaxDistance;
}
else
@@ -236,7 +235,6 @@ namespace OpenSim.Region.CoreModules.World.Sound
if (!ssp.ParcelAllowThisAvatarSounds)
return;
}
radius = (float)part.SoundRadius;

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

@@ -172,7 +172,6 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
detailTexture[i].Save(stream, ImageFormat.Png);
data = stream.ToArray();
}
// Cache a PNG copy of this terrain texture
AssetBase newAsset = new AssetBase
{
@@ -278,7 +277,6 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
mapColorsBlue[t] = DEFAULT_TERRAIN_COLOR[t].B;
}
}
#region Layer Map
float xFactor = terrain.Width / twidth;