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

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

11
OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
View File

@@ -31,7 +31,7 @@ using System.Drawing;
using System.IO;
using System.Reflection;
using System.Text;
using System.Threading;
using log4net;
using Mono.Addins;
using Nini.Config;
@@ -41,7 +41,6 @@ using CSJ2K;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces;
namespace OpenSim.Region.CoreModules.Agent.TextureSender
{
@@ -137,9 +136,9 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
// If it's cached, return the cached results
if (m_decodedCache.TryGetValue(assetID, out result))
{
// m_log.DebugFormat(
// "[J2KDecoderModule]: Returning existing cached {0} layers j2k decode for {1}",
// result.Length, assetID);
//m_log.DebugFormat(
// "[J2KDecoderModule]: Returning existing cached {0} layers j2k decode for {1}",
// result.Length, assetID);
callback(assetID, result);
}
@@ -186,7 +185,9 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
public Image DecodeToImage(byte[] j2kData)
{
if (m_useCSJ2K)
{
return J2kImage.FromBytes(j2kData);
}
else
{
ManagedImage mimage;

1
OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs
View File

@@ -53,7 +53,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
HGFriendsServicesConnector fConn = new(friendsServerURI);
List<UUID> friendsOnline = fConn.StatusNotification(ids, userID, online);
if (friendsOnline.Count > 0)
{
IClientAPI client = m_FriendsModule.LocateClientObject(userID);

1
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
View File

@@ -206,7 +206,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
return;
}
// Record the creator of this item for user record purposes (which might go away soon)
m_userUuids[inventoryItem.CreatorIdAsUuid] = 1;

8
OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
View File

@@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
bool foreign = GetUserProfileServerURI(req.agent, out string serverURI);
bool ok = serverURI.Length > 0;
Byte[] membershipType = new Byte[1];
byte[] membershipType = new byte[1];
string born = string.Empty;
uint flags = 0x00;
@@ -729,6 +729,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
remoteClient.SendAgentAlertMessage("Error fetching classifieds", false);
return;
}
parameters = (OSDMap)osdtmp;
OSDArray list = (OSDArray)parameters["result"];
bool exists = list.Cast<OSDMap>().Where(map => map.ContainsKey("classifieduuid"))
@@ -1809,7 +1810,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
/// </returns>
bool GetProfileData(ref UserProfileProperties properties, bool foreign, string serverURI, out string message)
{
if (String.IsNullOrEmpty(serverURI))
if (string.IsNullOrEmpty(serverURI))
{
message = "User profile service unknown at this time";
return false;
@@ -1887,7 +1888,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
{
// Is Foreign
string home_url = UserManagementModule.GetUserServerURL(userID, "HomeURI", out bool recentFailedWeb);
if (recentFailedWeb || String.IsNullOrEmpty(home_url))
if (recentFailedWeb || string.IsNullOrEmpty(home_url))
return false;
UserAgentServiceConnector uConn = new(home_url);
@@ -1995,6 +1996,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
Services.Interfaces.PresenceInfo[] pi = Scene.PresenceService?.GetAgents(new string[] { agent.ToString() });
return pi is not null && pi.Length > 0;
}
return false;
}

2
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
View File

@@ -191,6 +191,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
MaxConnectionsPerServer = maxThreads < 10 ? maxThreads : 10,
PooledConnectionLifetime = TimeSpan.FromMinutes(3)
};
//shhnc.SslOptions.ClientCertificates = null,
shh.SslOptions.EnabledSslProtocols = SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12 | SslProtocols.Tls13;
shh.SslOptions.CertificateRevocationCheckMode = X509RevocationMode.NoCheck;
@@ -579,7 +580,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
public int MaxRedirects { get; set; } = 10;
public string OutboundBody;
public string ResponseBody;
public Dictionary<string, string> Headers;
public int Status;

3
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
View File

@@ -92,7 +92,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
return;
}
string serviceDll = inventoryConfig.GetString("LocalServiceModule", String.Empty);
string serviceDll = inventoryConfig.GetString("LocalServiceModule", string.Empty);
if (serviceDll.Length == 0)
{
@@ -198,7 +198,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
}
return invColl;
}
public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)

1
OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
View File

@@ -210,7 +210,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
return;
}
// mapTile.Save( // DEBUG DEBUG
// String.Format("maptiles/raw-{0}-{1}-{2}.jpg", regionName, scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY),
// ImageFormat.Jpeg);

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;