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

cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2026-06-19 01:41:02 +01:00
parent 2720a1db36
commit ecdcaca032
12 changed files with 53 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
OpenSim/Framework/AvatarAppearance.cs
View File

@@ -916,18 +916,17 @@ namespace OpenSim.Framework
{
// Wearables
OSD tmpOSD8;
OSDArray wears8 = null;
int wears8Count = 0;
if (data.TryGetValue("wrbls8", out tmpOSD8) && (tmpOSD8 is OSDArray))
if (data.TryGetValue("wrbls8", out tmpOSD8) && (tmpOSD8 is OSDArray wears8))
{
wears8 = (OSDArray)tmpOSD8;
wears8Count = wears8.Count;
}
else
wears8 = null;
if (data.TryGetValue("wearables", out tmpOSD) && (tmpOSD is OSDArray))
if (data.TryGetValue("wearables", out tmpOSD) && (tmpOSD is OSDArray wears))
{
OSDArray wears = (OSDArray)tmpOSD;
if(wears.Count + wears8Count > 0)
{
m_wearables = new AvatarWearable[wears.Count + wears8Count];
@@ -948,9 +947,8 @@ namespace OpenSim.Framework
Primitive.TextureEntry te = new Primitive.TextureEntry(teb, 0, teb.Length);
m_texture = te;
}
else if (data.TryGetValue("textures", out tmpOSD) && (tmpOSD is OSDArray))
else if (data.TryGetValue("textures", out tmpOSD) && (tmpOSD is OSDArray textures))
{
OSDArray textures = (OSDArray)tmpOSD;
for (int i = 0; i < textures.Count && i < TEXTURE_COUNT_PV7; ++i)
{
tmpOSD = textures[i];
@@ -959,26 +957,12 @@ namespace OpenSim.Framework
}
}
if (data.TryGetValue("bakedcache", out tmpOSD) && (tmpOSD is OSDArray))
if (data.TryGetValue("bakedcache", out tmpOSD) && (tmpOSD is OSDArray bakedOSDArray))
{
OSDArray bakedOSDArray = (OSDArray)tmpOSD;
m_cacheitems = WearableCacheItem.GetDefaultCacheItem();
bakedOSDArray = (OSDArray)tmpOSD;
foreach (OSDMap item in bakedOSDArray)
foreach (OSD oitem in bakedOSDArray)
{
int idx = item["textureindex"].AsInteger();
if (idx < 0 || idx >= m_cacheitems.Length)
continue;
m_cacheitems[idx].CacheId = item["cacheid"].AsUUID();
m_cacheitems[idx].TextureID = item["textureid"].AsUUID();
m_cacheitems[idx].TextureAsset = null;
}
if (data.TryGetValue("bc8", out tmpOSD) && (tmpOSD is OSDArray))
{
bakedOSDArray = (OSDArray)tmpOSD;
foreach (OSDMap item in bakedOSDArray)
if(oitem is OSDMap item)
{
int idx = item["textureindex"].AsInteger();
if (idx < 0 || idx >= m_cacheitems.Length)
@@ -988,6 +972,22 @@ namespace OpenSim.Framework
m_cacheitems[idx].TextureAsset = null;
}
}
if (data.TryGetValue("bc8", out tmpOSD) && (tmpOSD is OSDArray))
{
foreach (OSD oitem in bakedOSDArray)
{
if(oitem is OSDMap item)
{
int idx = item["textureindex"].AsInteger();
if (idx < 0 || idx >= m_cacheitems.Length)
continue;
m_cacheitems[idx].CacheId = item["cacheid"].AsUUID();
m_cacheitems[idx].TextureID = item["textureid"].AsUUID();
m_cacheitems[idx].TextureAsset = null;
}
}
}
}
// Visual Parameters
@@ -1002,9 +1002,8 @@ namespace OpenSim.Framework
}
// Attachments
if (data.TryGetValue("attachments", out tmpOSD) && tmpOSD is OSDArray)
if (data.TryGetValue("attachments", out tmpOSD) && tmpOSD is OSDArray attachs)
{
OSDArray attachs = (OSDArray)tmpOSD;
for (int i = 0; i < attachs.Count; i++)
{
AvatarAttachment att = new AvatarAttachment((OSDMap)attachs[i]);

3
OpenSim/Framework/Lazy.cs
View File

@@ -81,8 +81,7 @@ namespace OpenSim.Framework
public Lazy(Func<T> valueFactory, LazyThreadSafetyMode mode)
{
if (valueFactory == null)
throw new ArgumentNullException("valueFactory");
ArgumentNullException.ThrowIfNull(valueFactory);
this.factory = valueFactory;
if (mode != LazyThreadSafetyMode.None)
monitor = new object();

12
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@@ -212,6 +212,7 @@ namespace OpenSim.Framework.Servers.HttpServer
{
set { m_certificateValidationCallback = value; }
}
private static readonly char[] LineSeparators = ['\n','\r'];
private void load_cert(string CPath, string CPass)
{
@@ -223,13 +224,13 @@ namespace OpenSim.Framework.Servers.HttpServer
{
AsnEncodedData asndata = new AsnEncodedData(ext.Oid, ext.RawData);
string datastr = asndata.Format(true);
string[] lines = datastr.Split(new char[] {'\n','\r'});
string[] lines = datastr.Split(LineSeparators);
foreach(string s in lines)
{
if(String.IsNullOrEmpty(s))
if(string.IsNullOrEmpty(s))
continue;
string[] parts = s.Split(new char[] {'='});
if(String.IsNullOrEmpty(parts[0]))
string[] parts = s.Split('=');
if(string.IsNullOrEmpty(parts[0]))
continue;
string entryName = parts[0].Replace(" ","");
if(entryName == "DNSName")
@@ -1015,8 +1016,7 @@ namespace OpenSim.Framework.Servers.HttpServer
}
finally
{
if (innerStream != null)
innerStream.Dispose();
innerStream?.Dispose();
inputStream.Dispose();
}
}

2
OpenSim/Framework/Servers/HttpServer/OSHttpServer/RequestCookie.cs
View File

@@ -22,7 +22,7 @@ namespace OSHttpServer
public RequestCookie(string id, string content)
{
if (string.IsNullOrEmpty(id)) throw new ArgumentNullException("id");
if (content == null) throw new ArgumentNullException("content");
ArgumentNullException.ThrowIfNull(content);
_name = id;
_value = content;

12
OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
View File

@@ -79,8 +79,10 @@ namespace OpenSim.Framework.Servers.HttpServer
using (MemoryStream buffer = new MemoryStream())
{
XmlWriterSettings settings = new XmlWriterSettings();
settings.Encoding = Encoding.UTF8;
XmlWriterSettings settings = new()
{
Encoding = Encoding.UTF8
};
using (XmlWriter writer = XmlWriter.Create(buffer, settings))
{
@@ -134,8 +136,7 @@ namespace OpenSim.Framework.Servers.HttpServer
using (MemoryStream buffer = new MemoryStream())
{
XmlWriterSettings settings = new XmlWriterSettings();
settings.Encoding = Encoding.UTF8;
XmlWriterSettings settings = new() { Encoding = Encoding.UTF8 };
using (XmlWriter writer = XmlWriter.Create(buffer, settings))
{
@@ -169,8 +170,7 @@ namespace OpenSim.Framework.Servers.HttpServer
// m_log.DebugFormat("[REST OBJECT POSTER RESPONSE]: Received {0}", reader.ReadToEnd());
deserial = (TResponse)deserializer.Deserialize(stream);
if (stream != null)
stream.Close();
stream?.Close();
if (deserial != null && ResponseCallback != null)
{

3
OpenSim/Framework/WebUtil.cs
View File

@@ -1009,8 +1009,7 @@ namespace OpenSim.Framework
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(requestUrl);
if (auth != null)
auth.AddAuthorization(request.Headers);
auth?.AddAuthorization(request.Headers);
request.AllowWriteStreamBuffering = false;