From 0d71b6d871e58dcca0549c6469a0851487ecce5f Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 25 Jun 2025 02:22:28 +0100 Subject: [PATCH] very useless changes --- OpenSim/Addons/Groups/GroupsModule.cs | 1 - .../Remote/OfflineIMServiceRemoteConnector.cs | 4 +- .../OfflineIM/Service/OfflineIMService.cs | 1 - .../FetchInventory/FetchInvDescHandler.cs | 1 + OpenSim/Capabilities/LLSD.cs | 20 +++--- OpenSim/Data/MySQL/MySQLSimulationData.cs | 1 + OpenSim/Data/MySQL/MySQLUserProfilesData.cs | 1 - OpenSim/Data/PGSQL/PGSQLManager.cs | 2 +- .../PGSQL/Resources/InventoryStore.migrations | 2 +- OpenSim/Data/SQLite/SQLiteSimulationData.cs | 6 +- OpenSim/Framework/AnimationSet.cs | 1 + OpenSim/Framework/ChildAgentDataUpdate.cs | 2 - OpenSim/Framework/PrimitiveBaseShape.cs | 3 +- OpenSim/Framework/RestClient.cs | 1 - .../Framework/Servers/BaseOpenSimServer.cs | 2 +- .../OSHttpServer/HttpClientContext.cs | 1 + OpenSim/Framework/Servers/ServerBase.cs | 7 +-- OpenSim/Framework/TerrainData.cs | 2 - OpenSim/Framework/ViewerEnvironment.cs | 1 - OpenSim/Framework/WebUtil.cs | 3 +- OpenSim/Region/Application/Application.cs | 2 +- .../Caps/BunchOfCaps/BunchOfCapsModule.cs | 1 - .../Linden/Caps/BunchOfCaps/MeshCost.cs | 5 +- .../Linden/Caps/SimulatorFeaturesModule.cs | 3 +- .../ClientStack/Linden/UDP/LLClientView.cs | 10 +-- .../ClientStack/Linden/UDP/OpenSimUDPBase.cs | 2 - .../Agent/TextureSender/J2KDecoderModule.cs | 11 ++-- .../Avatar/Friends/HGStatusNotifier.cs | 1 - .../Archiver/InventoryArchiveWriteRequest.cs | 1 - .../Avatar/UserProfiles/UserProfileModule.cs | 8 ++- .../HttpRequest/ScriptsHttpRequests.cs | 2 +- .../LocalInventoryServiceConnector.cs | 3 +- .../MapImage/MapImageServiceModule.cs | 1 - .../World/Archiver/ArchiveWriteRequest.cs | 2 + .../World/Archiver/AssetsRequest.cs | 1 - .../World/Land/LandManagementModule.cs | 10 +-- .../CoreModules/World/Land/LandObject.cs | 1 - .../World/LightShare/EnvironmentModule.cs | 3 +- .../World/Permissions/PermissionsModule.cs | 1 + .../CoreModules/World/Sound/SoundModule.cs | 2 - .../World/Warp3DMap/TerrainSplat.cs | 2 - .../Region/Framework/Scenes/LinksetData.cs | 2 + .../Framework/Scenes/Scene.Inventory.cs | 3 - OpenSim/Region/Framework/Scenes/Scene.cs | 5 +- OpenSim/Region/Framework/Scenes/SceneGraph.cs | 2 +- .../Scenes/SceneObjectGroup.Inventory.cs | 2 - .../Framework/Scenes/SceneObjectGroup.cs | 1 - .../Framework/Scenes/SceneObjectPart.cs | 11 ++-- .../Scenes/SceneObjectPartInventory.cs | 2 +- .../Region/Framework/Scenes/ScenePresence.cs | 6 +- .../Serialization/SceneObjectSerializer.cs | 2 - .../Region/Framework/Scenes/UuidGatherer.cs | 2 - .../Agent/UDP/Linden/LindenUDPInfoModule.cs | 1 - .../PhysicsModules/ubOde/ODEDynamics.cs | 1 - .../PhysicsModules/ubOdeMeshing/PrimMesher.cs | 15 +++-- .../PhysicsModules/ubOdeMeshing/SculptMesh.cs | 1 - .../Shared/Api/Implementation/LSL_Api.cs | 63 +++++-------------- .../Shared/Api/Implementation/OSSL_Api.cs | 7 --- .../Implementation/Plugins/SensorRepeat.cs | 1 - .../Shared/Api/Interface/ILSL_Api.cs | 2 - .../Shared/Api/Runtime/OSSL_Stub.cs | 1 + .../Region/ScriptEngine/Shared/LSL_Types.cs | 21 ++----- .../ScriptEngine/YEngine/MMRScriptBinOpStr.cs | 2 +- .../ScriptEngine/YEngine/MMRScriptConsts.cs | 3 - .../ScriptEngine/YEngine/MMRScriptReduce.cs | 1 - .../ScriptEngine/YEngine/MMRScriptTypeCast.cs | 1 - .../Region/ScriptEngine/YEngine/XMREngine.cs | 8 +-- .../Region/ScriptEngine/YEngine/XMRInstRun.cs | 1 + OpenSim/Services/Base/ServiceBase.cs | 2 +- .../Connectors/Estate/EstateDataConnector.cs | 12 ++-- .../Connectors/Grid/GridServicesConnector.cs | 4 +- .../HypergridService/GatekeeperService.cs | 2 +- .../HypergridService/UserAgentServiceBase.cs | 8 +-- .../InventoryService/XInventoryService.cs | 8 +-- .../LLLoginService/LLLoginResponse.cs | 1 - .../MapImageService/MapImageService.cs | 4 +- .../UserAccountService/UserAccountService.cs | 2 +- .../UserProfilesService.cs | 2 - 78 files changed, 123 insertions(+), 223 deletions(-) diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs index cfca4e6003..a44d7dc822 100755 --- a/OpenSim/Addons/Groups/GroupsModule.cs +++ b/OpenSim/Addons/Groups/GroupsModule.cs @@ -1582,6 +1582,5 @@ namespace OpenSim.Groups { return client is null ? UUID.Zero : client.AgentId; } - } } diff --git a/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRemoteConnector.cs b/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRemoteConnector.cs index 9fb2b4b677..e6580a1b90 100644 --- a/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRemoteConnector.cs +++ b/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRemoteConnector.cs @@ -88,8 +88,8 @@ namespace OpenSim.OfflineIM Dictionary sendData = new Dictionary(); sendData["PrincipalID"] = principalID; - Dictionary ret = MakeRequest("GET", sendData); + Dictionary ret = MakeRequest("GET", sendData); if (ret == null) return ims; @@ -118,14 +118,12 @@ namespace OpenSim.OfflineIM } } } - return ims; } public bool StoreMessage(GridInstantMessage im, out string reason) { Dictionary sendData = OfflineIMDataUtils.GridInstantMessage(im); - Dictionary ret = MakeRequest("STORE", sendData); if (ret == null) diff --git a/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs b/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs index 57c724a171..952c64f568 100644 --- a/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs +++ b/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs @@ -163,6 +163,5 @@ namespace OpenSim.OfflineIM m_Database.Delete("PrincipalID", userID.ToString()); m_Database.Delete("FromID", userID.ToString()); } - } } diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs index 085260eadb..fef9245f80 100644 --- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs +++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs @@ -70,6 +70,7 @@ namespace OpenSim.Capabilities.Handlers List folders; List bad_folders = new(); + try { OSDArray foldersrequested = null; diff --git a/OpenSim/Capabilities/LLSD.cs b/OpenSim/Capabilities/LLSD.cs index d4f50b7fca..63b6cf4bb6 100644 --- a/OpenSim/Capabilities/LLSD.cs +++ b/OpenSim/Capabilities/LLSD.cs @@ -115,7 +115,7 @@ namespace OpenSim.Framework.Capabilities { writer.Formatting = Formatting.None; - writer.WriteStartElement(String.Empty, "llsd", String.Empty); + writer.WriteStartElement(string.Empty, "llsd", string.Empty); LLSDWriteOne(writer, obj); writer.WriteEndElement(); writer.Flush(); @@ -132,32 +132,32 @@ namespace OpenSim.Framework.Capabilities { if (obj == null) { - writer.WriteStartElement(String.Empty, "undef", String.Empty); + writer.WriteStartElement(string.Empty, "undef", string.Empty); writer.WriteEndElement(); return; } if (obj is string s) { - writer.WriteStartElement(String.Empty, "string", String.Empty); + writer.WriteStartElement(string.Empty, "string", string.Empty); writer.WriteString(s); writer.WriteEndElement(); } else if (obj is int) { - writer.WriteStartElement(String.Empty, "integer", String.Empty); + writer.WriteStartElement(string.Empty, "integer", string.Empty); writer.WriteString(obj.ToString()); writer.WriteEndElement(); } else if (obj is double || obj is float) { - writer.WriteStartElement(String.Empty, "real", String.Empty); + writer.WriteStartElement(string.Empty, "real", string.Empty); writer.WriteString(obj.ToString()); writer.WriteEndElement(); } else if (obj is bool b) { - writer.WriteStartElement(String.Empty, "boolean", String.Empty); + writer.WriteStartElement(string.Empty, "boolean", string.Empty); writer.WriteString(b ? "1" : "0"); writer.WriteEndElement(); } @@ -167,7 +167,7 @@ namespace OpenSim.Framework.Capabilities } else if (obj is UUID u) { - writer.WriteStartElement(String.Empty, "uuid", String.Empty); + writer.WriteStartElement(string.Empty, "uuid", string.Empty); writer.WriteString(u.ToString()); writer.WriteEndElement(); } @@ -185,10 +185,10 @@ namespace OpenSim.Framework.Capabilities } else if (obj is Dictionary dict) { - writer.WriteStartElement(String.Empty, "map", String.Empty); + writer.WriteStartElement(string.Empty, "map", string.Empty); foreach (KeyValuePair kvp in dict) { - writer.WriteStartElement(String.Empty, "key", String.Empty); + writer.WriteStartElement(string.Empty, "key", string.Empty); writer.WriteString(kvp.Key); writer.WriteEndElement(); LLSDWriteOne(writer, kvp.Value); @@ -197,7 +197,7 @@ namespace OpenSim.Framework.Capabilities } else if (obj is ArrayList a) { - writer.WriteStartElement(String.Empty, "array", String.Empty); + writer.WriteStartElement(string.Empty, "array", string.Empty); foreach (object item in a) { LLSDWriteOne(writer, item); diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 94c5f33214..37203c7c13 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs @@ -341,6 +341,7 @@ namespace OpenSim.Data.MySQL while (reader.Read()) { SceneObjectPart prim = BuildPrim(reader); + if (reader["Shape"] is DBNull) prim.Shape = PrimitiveBaseShape.Default; else diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs index 2d7ead4e07..85a37adb0b 100644 --- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs +++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs @@ -295,7 +295,6 @@ namespace OpenSim.Data.MySQL ad.SimName = reader.GetString("simname"); ad.GlobalPos = reader.GetString("posglobal"); ad.ParcelName = reader.GetString("parcelname"); - } } } diff --git a/OpenSim/Data/PGSQL/PGSQLManager.cs b/OpenSim/Data/PGSQL/PGSQLManager.cs index ef9d95eb39..9864e27249 100644 --- a/OpenSim/Data/PGSQL/PGSQLManager.cs +++ b/OpenSim/Data/PGSQL/PGSQLManager.cs @@ -174,7 +174,7 @@ namespace OpenSim.Data.PGSQL { return (bool)value; } - if (valueType == typeof(Byte[])) + if (valueType == typeof(byte[])) { return value; } diff --git a/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations b/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations index 20afbeede3..2a3bcc3b44 100644 --- a/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations +++ b/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations @@ -139,7 +139,7 @@ CREATE TABLE Tmp_inventoryitems INSERT INTO Tmp_inventoryitems ("inventoryID", "assetID", "assetType", "parentFolderID", "avatarID", "inventoryName", "inventoryDescription", "inventoryNextPermissions", "inventoryCurrentPermissions", "invType", "creatorID", "inventoryBasePermissions", "inventoryEveryOnePermissions", "salePrice", "SaleType", "creationDate", "groupID", "groupOwned", "flags", "inventoryGroupPermissions") - SELECT cast("inventoryID" as uuid), cast("assetID" as uuid), "assetType", cast("parentFolderID" as uuid), cast("avatarID" as uuid), "inventoryName", "inventoryDescription", "inventoryNextPermissions", "inventoryCurrentPermissions", "invType", cast("creatorID" as uuid), "inventoryBasePermissions", "inventoryEveryOnePermissions", "salePrice", "SaleType", "creationDate", cast("groupID" as uuid), "groupOwned", "flags", "inventoryGroupPermissions" + SELECT cast("inventoryID" as uuid), cast("assetID" as uuid), "assetType", cast("parentFolderID" as uuid), cast("avatarID" as uuid), "inventoryName", "inventoryDescription", "inventoryNextPermissions", "inventoryCurrentPermissions", "invType", cast("creatorID" as uuid), "inventoryBasePermissions", "inventoryEveryOnePermissions", "salePrice", "saleType", "creationDate", cast("groupID" as uuid), "groupOwned", "flags", "inventoryGroupPermissions" FROM inventoryitems ; DROP TABLE inventoryitems; diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 697876301e..7d75ad11fc 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs @@ -669,8 +669,6 @@ namespace OpenSim.Data.SQLite createdObjects.Add(group.UUID, group); retvals.Add(group); LoadItems(prim); - - } } catch (Exception e) @@ -1301,8 +1299,8 @@ namespace OpenSim.Data.SQLite createCol(shapes, "LastAttachPoint", typeof(Int32)); // text TODO: this isn't right, but I'm not sure the right // way to specify this as a blob atm - createCol(shapes, "Texture", typeof(Byte[])); - createCol(shapes, "ExtraParams", typeof(Byte[])); + createCol(shapes, "Texture", typeof(byte[])); + createCol(shapes, "ExtraParams", typeof(byte[])); createCol(shapes, "Media", typeof(String)); createCol(shapes, "MatOvrd", typeof(byte[])); shapes.PrimaryKey = new DataColumn[] { shapes.Columns["UUID"] }; diff --git a/OpenSim/Framework/AnimationSet.cs b/OpenSim/Framework/AnimationSet.cs index 0cc39d8fed..1beea4779d 100644 --- a/OpenSim/Framework/AnimationSet.cs +++ b/OpenSim/Framework/AnimationSet.cs @@ -142,6 +142,7 @@ namespace OpenSim.Framework sb.AppendASCII($"{kvp.Key} {kvp.Value.Value} {kvp.Value.Key}\n"); return OSUTF8Cached.GetArrayAndRelease(sb); } + /* public bool Validate(AnimationSetValidator val) { diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 13b52727b4..aee959157e 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs @@ -216,7 +216,6 @@ namespace OpenSim.Framework } } } - } /// @@ -312,7 +311,6 @@ namespace OpenSim.Framework return controldata; } - public void UnpackUpdateMessage(OSDMap args) { OSD osdtmp; diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index fee56919a8..539aac2ad7 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs @@ -320,9 +320,7 @@ namespace OpenSim.Framework get { PrimitiveBaseShape boxShape = CreateBox(); - boxShape.SetScale(0.5f); - return boxShape; } } @@ -1541,6 +1539,7 @@ namespace OpenSim.Framework if (data is null || data.Length < 1) return; + int nentries = data[0]; if (nentries > 128) return; diff --git a/OpenSim/Framework/RestClient.cs b/OpenSim/Framework/RestClient.cs index 49c7f632a5..c0826fb378 100644 --- a/OpenSim/Framework/RestClient.cs +++ b/OpenSim/Framework/RestClient.cs @@ -402,6 +402,5 @@ namespace OpenSim.Framework client?.Dispose(); } } - } } diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 940713b17c..b958867d7a 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs @@ -179,7 +179,7 @@ namespace OpenSim.Framework.Servers { m_log.Info("[STARTUP]: Beginning startup processing"); - m_log.Info("[STARTUP]: version: " + m_version); + m_log.Info("[STARTUP]: Version: " + m_version); m_log.Info($"[STARTUP]: Operating system version: {Environment.OSVersion}, .NET platform {Util.RuntimePlatformStr}, Runtime {Environment.Version}"); m_log.Info($"[STARTUP]: Processor Architecture: {RuntimeInformation.ProcessArchitecture}({(BitConverter.IsLittleEndian ? "le" : "be")} {(Environment.Is64BitProcess ? "64" : "32")}bit)"); try diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpClientContext.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpClientContext.cs index 70e7adfeaa..61e4865cc0 100644 --- a/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpClientContext.cs +++ b/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpClientContext.cs @@ -219,6 +219,7 @@ namespace OSHttpServer /// public virtual void Cleanup() { + if (StreamPassedOff) return; diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs index 60a99890d5..f911da6373 100755 --- a/OpenSim/Framework/Servers/ServerBase.cs +++ b/OpenSim/Framework/Servers/ServerBase.cs @@ -63,7 +63,7 @@ namespace OpenSim.Framework.Servers protected DateTime m_startuptime; protected string m_startupDirectory = Environment.CurrentDirectory; - protected string m_pidFile = String.Empty; + protected string m_pidFile = string.Empty; protected ServerStatsCollector m_serverStatsCollector; @@ -90,7 +90,7 @@ namespace OpenSim.Framework.Servers using (FileStream fs = File.Create(path)) { - Byte[] buf = Encoding.ASCII.GetBytes(pidstring); + byte[] buf = Encoding.ASCII.GetBytes(pidstring); fs.Write(buf, 0, buf.Length); } @@ -116,8 +116,7 @@ namespace OpenSim.Framework.Servers { m_log.Error($"[SERVER BASE]: Error whilst removing {m_pidFile}", e); } - - m_pidFile = String.Empty; + m_pidFile = string.Empty; } } diff --git a/OpenSim/Framework/TerrainData.cs b/OpenSim/Framework/TerrainData.cs index 3eab9fd746..7ddfd3ace9 100644 --- a/OpenSim/Framework/TerrainData.cs +++ b/OpenSim/Framework/TerrainData.cs @@ -78,7 +78,6 @@ namespace OpenSim.Framework private readonly int m_mapStride; private readonly int m_mapPatchsStride; - // legacy CompressionFactor public float CompressionFactor { get; private set; } @@ -469,7 +468,6 @@ namespace OpenSim.Framework for (int jj = 0; jj < SizeY; jj++) { m_heightmap[ii, jj] = (float)pTerrain[ii, jj]; - } } // m_log.DebugFormat("{0} new by doubles. sizeX={1}, sizeY={2}, sizeZ={3}", LogHeader, SizeX, SizeY, SizeZ); diff --git a/OpenSim/Framework/ViewerEnvironment.cs b/OpenSim/Framework/ViewerEnvironment.cs index 65ca2482a8..678674481b 100644 --- a/OpenSim/Framework/ViewerEnvironment.cs +++ b/OpenSim/Framework/ViewerEnvironment.cs @@ -316,7 +316,6 @@ namespace OpenSim.Framework return; OSD otmp; - if (map.TryGetValue("day_cycle", out otmp) && otmp is OSDMap) { Cycle = new DayCycle(); diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index 6911fdc91c..8fd9f26171 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs @@ -533,7 +533,6 @@ namespace OpenSim.Framework { int reqnum = RequestNumber++; string method = (data is not null && data["RequestMethod"] is not null) ? data["RequestMethod"] : "unknown"; - if (DebugLevel >= 3) m_log.Debug($"[LOGHTTP]: HTTP OUT {reqnum} ServiceForm '{method}' to {url}"); @@ -1150,7 +1149,7 @@ namespace OpenSim.Framework HttpResponseMessage responseMessage = null; HttpRequestMessage request = null; HttpClient client = null; - string respstring = String.Empty; + string respstring = string.Empty; int sendlen = 0; int rcvlen = 0; try diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index c54e747929..a42000a29e 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs @@ -78,7 +78,7 @@ namespace OpenSim AppContext.SetSwitch("System.Drawing.EnableUnixSupport", true); - /* + // pre load System.Drawing.Common.dll for the platform // this will fail if a newer version is present on GAC, bin folder, etc, since LoadFrom only accepts the path, if it cannot find it elsewhere string targetdll = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),"lib", diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs index 333b070fa1..23aecd1ce3 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs @@ -168,6 +168,5 @@ namespace OpenSim.Region.ClientStack.Linden { _ = new BunchOfCaps(m_Scene, agentID, caps, ConfigOptions); } - } } diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs index 03e03f10f8..39f6c4eaf2 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs @@ -98,7 +98,6 @@ namespace OpenSim.Region.ClientStack.Linden public float PhysicalPrimScaleMax = 10f; public int ObjectLinkedPartsMax = 512; - public ModelCost(Scene scene) { PrimScaleMin = scene.m_minNonphys; @@ -152,7 +151,7 @@ namespace OpenSim.Region.ClientStack.Linden resources.instance_list == null || resources.instance_list.Array.Count == 0) { - error = "Missing model information."; + error = "missing model information."; return false; } @@ -216,7 +215,7 @@ namespace OpenSim.Region.ClientStack.Linden { if (avatarSkeleton) { - error = "Model can only contain a avatar skeleton"; + error = "model can only contain a avatar skeleton"; return false; } avatarSkeleton = true; diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs index e6015ecc20..b0617302da 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs @@ -184,6 +184,7 @@ namespace OpenSim.Region.ClientStack.Linden if (m_ExportSupported) extrasMap["ExportSupported"] = true; + m_features["OpenSimExtras"] = extrasMap; } } @@ -434,7 +435,7 @@ namespace OpenSim.Region.ClientStack.Linden while ((s = sr.ReadLine()) is not null) { s = s.Trim(trimc); - if (String.IsNullOrEmpty(s) || s.StartsWith("