diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs index dc52320b32..e5aa79b824 100755 --- a/OpenSim/Addons/Groups/GroupsMessagingModule.cs +++ b/OpenSim/Addons/Groups/GroupsMessagingModule.cs @@ -325,7 +325,7 @@ namespace OpenSim.Groups im.RegionID = thisClient.Scene.RegionInfo.RegionID.Guid; } - if ((im.binaryBucket == null) || (im.binaryBucket.Length == 0) || ((im.binaryBucket.Length == 1 && im.binaryBucket[0] == 0))) + if (im.binaryBucket is null || im.binaryBucket.Length == 0 || (im.binaryBucket.Length == 1 && im.binaryBucket[0] == 0)) { ExtendedGroupRecord groupInfo = m_groupData.GetGroupRecord(UUID.Zero.ToString(), groupID, null); if (groupInfo != null) diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs index 314a605795..9e42c22f70 100755 --- a/OpenSim/Addons/Groups/GroupsModule.cs +++ b/OpenSim/Addons/Groups/GroupsModule.cs @@ -1113,7 +1113,7 @@ namespace OpenSim.Groups { m_log.DebugFormat("[Groups]: Group Notice {0} not found, composing empty message.", groupNoticeID); msg.fromAgentID = UUID.Zero.Guid; - msg.timestamp = (uint)Util.UnixTimeSinceEpoch(); ; + msg.timestamp = (uint)Util.UnixTimeSinceEpoch(); msg.fromAgentName = string.Empty; msg.message = string.Empty; msg.binaryBucket = Array.Empty(); ; @@ -1275,7 +1275,7 @@ namespace OpenSim.Groups msg.ParentEstateID = 0; msg.Position = Vector3.Zero; msg.RegionID = regionInfo.RegionID.Guid; - msg.binaryBucket = Array.Empty(); ; + msg.binaryBucket = Array.Empty(); OutgoingInstantMessage(msg, ejecteeID); } @@ -1293,7 +1293,7 @@ namespace OpenSim.Groups msg.ParentEstateID = 0; msg.Position = Vector3.Zero; msg.RegionID = regionInfo.RegionID.Guid; - msg.binaryBucket = Array.Empty(); ; + msg.binaryBucket = Array.Empty(); OutgoingInstantMessage(msg, agentID); } diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs index e32d939014..580221fa63 100644 --- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs +++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs @@ -459,7 +459,7 @@ namespace OpenSim.Groups public GroupInviteInfo GetAgentToGroupInvite(string RequestingAgentID, UUID inviteID) { - return m_LocalGroupsConnector.GetAgentToGroupInvite(AgentUUI(RequestingAgentID), inviteID); ; + return m_LocalGroupsConnector.GetAgentToGroupInvite(AgentUUI(RequestingAgentID), inviteID); } public void RemoveAgentToGroupInvite(string RequestingAgentID, UUID inviteID) diff --git a/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs b/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs index cee1c9c8ff..312d4adf69 100644 --- a/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs +++ b/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs @@ -240,7 +240,7 @@ namespace OpenSim.Groups public GroupInviteInfo GetAgentToGroupInvite(string RequestingAgentID, UUID inviteID) { - return m_GroupsService.GetAgentToGroupInvite(RequestingAgentID, inviteID); ; + return m_GroupsService.GetAgentToGroupInvite(RequestingAgentID, inviteID); } public void RemoveAgentToGroupInvite(string RequestingAgentID, UUID inviteID) @@ -285,7 +285,7 @@ namespace OpenSim.Groups public ExtendedGroupMembershipData GetAgentGroupMembership(string RequestingAgentID, string AgentID, UUID GroupID) { - return m_GroupsService.GetAgentGroupMembership(RequestingAgentID, AgentID, GroupID); ; + return m_GroupsService.GetAgentGroupMembership(RequestingAgentID, AgentID, GroupID); } public List GetAgentGroupMemberships(string RequestingAgentID, string AgentID) diff --git a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs index a76112f773..c4ae981830 100644 --- a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs @@ -58,7 +58,7 @@ namespace OpenSim.Capabilities.Handlers } public Hashtable Handle(Hashtable request) { - return ProcessGetMesh(request, UUID.Zero, null); ; + return ProcessGetMesh(request, UUID.Zero, null); } public Hashtable ProcessGetMesh(Hashtable request, UUID AgentId, Caps cap) diff --git a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs index 10f1849d0a..b2b01492fe 100644 --- a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs +++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs @@ -72,7 +72,7 @@ namespace OpenSim.Capabilities.Handlers httpMethod => gmeshHandler.ProcessGetMesh(httpMethod, UUID.Zero, null), "GetMesh", null); - server.AddStreamHandler(reqHandler); ; + server.AddStreamHandler(reqHandler); } } } \ No newline at end of file diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs index 5ead2216c5..b823e31eb7 100644 --- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs @@ -292,7 +292,7 @@ namespace OpenSim.Capabilities.Handlers private byte[] ConvertTextureData(AssetBase texture, string format) { m_log.DebugFormat("[GETTEXTURE]: Converting texture {0} to {1}", texture.ID, format); - byte[] data = Array.Empty(); ; + byte[] data = Array.Empty(); MemoryStream imgstream = new MemoryStream(); Bitmap mTexture = null; diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs index 04a02a0ff8..dfc7fc7832 100644 --- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs @@ -320,7 +320,7 @@ namespace OpenSim.Capabilities.Handlers private byte[] ConvertTextureData(AssetBase texture, string format) { m_log.DebugFormat("[GETTEXTURE]: Converting texture {0} to {1}", texture.ID, format); - byte[] data = Array.Empty(); ; + byte[] data = Array.Empty(); MemoryStream imgstream = new MemoryStream(); Bitmap mTexture = null; diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs index 1cb21e7210..86e78185ac 100644 --- a/OpenSim/Data/MySQL/MySQLEstateData.cs +++ b/OpenSim/Data/MySQL/MySQLEstateData.cs @@ -301,7 +301,7 @@ namespace OpenSim.Data.MySQL while (r.Read()) { EstateBan eb = new EstateBan(); - eb.BannedUserID = DBGuid.FromDB(r["bannedUUID"]); ; + eb.BannedUserID = DBGuid.FromDB(r["bannedUUID"]); eb.BannedHostAddress = "0.0.0.0"; eb.BannedHostIPMask = "0.0.0.0"; eb.BanningUserID = DBGuid.FromDB(r["banningUUID"]); diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index c0895f5835..2497fc0e79 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs @@ -697,7 +697,7 @@ namespace OpenSim.Data.MySQL try { List folders = new List(); - Dictionary> hashtable = new Dictionary>(); ; + Dictionary> hashtable = new Dictionary>(); List parentFolder = new List(); bool buildResultsFromHashTable = false; diff --git a/OpenSim/Data/PGSQL/PGSQLFSAssetData.cs b/OpenSim/Data/PGSQL/PGSQLFSAssetData.cs index def1f4a173..c4d454d32c 100644 --- a/OpenSim/Data/PGSQL/PGSQLFSAssetData.cs +++ b/OpenSim/Data/PGSQL/PGSQLFSAssetData.cs @@ -210,7 +210,7 @@ namespace OpenSim.Data.PGSQL { while (reader.Read()) { - UUID id = DBGuid.FromDB(reader["id"]);; + UUID id = DBGuid.FromDB(reader["id"]); exists.Add(id); } } diff --git a/OpenSim/Data/SQLite/Resources/RegionStore.migrations b/OpenSim/Data/SQLite/Resources/RegionStore.migrations index caf6efc07d..1c91d42616 100644 --- a/OpenSim/Data/SQLite/Resources/RegionStore.migrations +++ b/OpenSim/Data/SQLite/Resources/RegionStore.migrations @@ -337,8 +337,8 @@ BEGIN; ALTER TABLE `prims` ADD COLUMN `PassTouches` BOOLEAN NOT NULL DEFAULT FALSE; ALTER TABLE `prims` ADD COLUMN `PassCollisions`BOOLEAN NOT NULL DEFAULT FALSE; ALTER TABLE `prims` ADD COLUMN `Vehicle` TEXT default NULL; -ALTER TABLE `regionsettings` ADD COLUMN `block_search` BOOLEAN NOT NULL DEFAULT FALSE;; -ALTER TABLE `regionsettings` ADD COLUMN `casino` BOOLEAN NOT NULL DEFAULT FALSE;; +ALTER TABLE `regionsettings` ADD COLUMN `block_search` BOOLEAN NOT NULL DEFAULT FALSE; +ALTER TABLE `regionsettings` ADD COLUMN `casino` BOOLEAN NOT NULL DEFAULT FALSE; ALTER TABLE `land` ADD COLUMN `SeeAVs` BOOLEAN NOT NULL DEFAULT TRUE; ALTER TABLE `land` ADD COLUMN `AnyAVSounds` BOOLEAN NOT NULL DEFAULT TRUE; ALTER TABLE `land` ADD COLUMN `GroupAVSounds` BOOLEAN NOT NULL DEFAULT TRUE; diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs index d223c0324e..5932e9e8eb 100644 --- a/OpenSim/Data/SQLite/SQLiteEstateData.cs +++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs @@ -241,7 +241,7 @@ namespace OpenSim.Data.SQLite using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand()) { - cmd.CommandText = "update estate_settings set " + String.Join(", ", terms.ToArray()) + " where EstateID = :EstateID"; ; + cmd.CommandText = "update estate_settings set " + String.Join(", ", terms.ToArray()) + " where EstateID = :EstateID"; cmd.Parameters.AddWithValue(":EstateID", es.EstateID); foreach (string name in FieldList) @@ -286,7 +286,7 @@ namespace OpenSim.Data.SQLite { EstateBan eb = new EstateBan(); - eb.BannedUserID = DBGuid.FromDB(r["bannedUUID"]); ; + eb.BannedUserID = DBGuid.FromDB(r["bannedUUID"]); eb.BannedHostAddress = "0.0.0.0"; eb.BannedHostIPMask = "0.0.0.0"; eb.BanningUserID = DBGuid.FromDB(r["banningUUID"]); diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index a07c82805f..5f47eafd05 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs @@ -2173,7 +2173,7 @@ namespace OpenSim.Data.SQLite if (prim.KeyframeMotion != null) row["KeyframeMotion"] = prim.KeyframeMotion.Serialize(); else - row["KeyframeMotion"] = Array.Empty(); ; + row["KeyframeMotion"] = Array.Empty(); row["PassTouches"] = prim.PassTouches; row["PassCollisions"] = prim.PassCollisions; @@ -2867,10 +2867,6 @@ namespace OpenSim.Data.SQLite { return DbType.Byte; } - else if (type == typeof(Double)) - { - return DbType.Double; - } else if (type == typeof(Byte[])) { return DbType.Binary; diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 3d811ce284..f1cb0f770f 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs @@ -463,7 +463,7 @@ namespace OpenSim.Framework args["god_data"] = GodData; OSDMap g = (OSDMap)GodData; if (g.ContainsKey("ViewerUiIsGod")) - args["god_level"] = g["ViewerUiIsGod"].AsBoolean() ? 200 : 0;; + args["god_level"] = g["ViewerUiIsGod"].AsBoolean() ? 200 : 0; } args["always_run"] = OSD.FromBoolean(AlwaysRun); args["prey_agent"] = OSD.FromUUID(PreyAgent); diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index e89b0ef674..3dd6a64201 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs @@ -373,8 +373,10 @@ namespace OpenSim.Framework if (!IsEstateManagerOrOwner(avatarID)) { foreach (EstateBan ban in l_EstateBans) - if (ban.BannedUserID == avatarID) + { + if (ban.BannedUserID.Equals(avatarID)) return true; + } } return false; } @@ -384,8 +386,10 @@ namespace OpenSim.Framework if (!IsEstateManagerOrOwner(avatarID)) { foreach (EstateBan ban in l_EstateBans) - if (ban.BannedUserID == avatarID) - return true; + { + if (ban.BannedUserID.Equals(avatarID)) + return true; + } if (!HasAccess(avatarID)) { @@ -415,7 +419,7 @@ namespace OpenSim.Framework public void AddBan(EstateBan ban) { - if (ban == null) + if (ban is null) return; if (!IsBanned(ban.BannedUserID, 32) && (l_EstateBans.Count < (int)Constants.EstateAccessLimits.EstateBans)) //Ignore age-based bans diff --git a/OpenSim/Framework/GridInstantMessage.cs b/OpenSim/Framework/GridInstantMessage.cs index 7f3980bdf1..5f1246a976 100644 --- a/OpenSim/Framework/GridInstantMessage.cs +++ b/OpenSim/Framework/GridInstantMessage.cs @@ -50,7 +50,7 @@ namespace OpenSim.Framework public GridInstantMessage() { - binaryBucket = Array.Empty(); ; + binaryBucket = Array.Empty(); } public GridInstantMessage(GridInstantMessage im, bool addTimestamp) diff --git a/OpenSim/Framework/ObjectJobEngine.cs b/OpenSim/Framework/ObjectJobEngine.cs index 11027c9b34..19e59d7147 100644 --- a/OpenSim/Framework/ObjectJobEngine.cs +++ b/OpenSim/Framework/ObjectJobEngine.cs @@ -124,7 +124,7 @@ namespace OpenSim.Framework return; try { - while(m_jobQueue.TryTake(out object dummy)); + while(m_jobQueue.TryTake(out _)); m_cancelSource.Cancel(); } catch { } diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 80719dc0b9..3ffa4bc5a3 100755 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -717,7 +717,7 @@ namespace OpenSim.Framework if (DefaultLandingPoint.Z < 0f) DefaultLandingPoint.Z = 0f; - if (ValuesCapped == true) + if (ValuesCapped) m_log.WarnFormat("[RegionInfo]: The default landing location for {0} has been capped to {1}", RegionName, DefaultLandingPoint); } diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs index ecc87cc2e1..284e79a756 100644 --- a/OpenSim/Framework/RegionSettings.cs +++ b/OpenSim/Framework/RegionSettings.cs @@ -287,56 +287,56 @@ namespace OpenSim.Framework public double Elevation2NW { get { return m_Elevation2NW; } - set { m_Elevation2NW = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap); ; } + set { m_Elevation2NW = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap);} } private double m_Elevation1NE = 10; public double Elevation1NE { get { return m_Elevation1NE; } - set { m_Elevation1NE = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap); ; } + set { m_Elevation1NE = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap);} } private double m_Elevation2NE = 60; public double Elevation2NE { get { return m_Elevation2NE; } - set { m_Elevation2NE = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap); ; } + set { m_Elevation2NE = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap);} } private double m_Elevation1SE = 10; public double Elevation1SE { get { return m_Elevation1SE; } - set { m_Elevation1SE = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap); ; } + set { m_Elevation1SE = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap);} } private double m_Elevation2SE = 60; public double Elevation2SE { get { return m_Elevation2SE; } - set { m_Elevation2SE = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap); ; } + set { m_Elevation2SE = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap);} } private double m_Elevation1SW = 10; public double Elevation1SW { get { return m_Elevation1SW; } - set { m_Elevation1SW = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap); ; } + set { m_Elevation1SW = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap);} } private double m_Elevation2SW = 60; public double Elevation2SW { get { return m_Elevation2SW; } - set { m_Elevation2SW = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap); ; } + set { m_Elevation2SW = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap);} } private double m_WaterHeight = 20; public double WaterHeight { get { return m_WaterHeight; } - set { m_WaterHeight = Utils.Clamp(value, Constants.MinWaterHeight, Constants.MaxWaterHeight); } + set { m_WaterHeight = Utils.Clamp(value, Constants.MinWaterHeight, Constants.MaxWaterHeight);} } private double m_TerrainRaiseLimit = 100; diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 40f99ef89c..5939b17cb8 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs @@ -2315,7 +2315,7 @@ namespace OpenSim.Framework.Servers.HttpServer } if (!httpRequest.QueryAsDictionary.TryGetValue("method", out string method) || string.IsNullOrWhiteSpace(method)) { - httpResponse.StatusCode = (int)HttpStatusCode.NotFound; ; + httpResponse.StatusCode = (int)HttpStatusCode.NotFound; return; } diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 4dc79e3d9e..518be9f41c 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -3637,7 +3637,7 @@ namespace OpenSim.Framework if (value.Contains(' ') && !value.Contains(',')) value = value.Replace(" ", ", "); - return (T)Enum.Parse(typeof(T), value); ; + return (T)Enum.Parse(typeof(T), value); } #endregion diff --git a/OpenSim/Framework/ViewerEnvironment.cs b/OpenSim/Framework/ViewerEnvironment.cs index 2f26afe1a3..0944a3f00b 100644 --- a/OpenSim/Framework/ViewerEnvironment.cs +++ b/OpenSim/Framework/ViewerEnvironment.cs @@ -215,7 +215,7 @@ namespace OpenSim.Framework sky.sunlight_color = ls.sunMoonColor * 3.0f; sky.ambient = new Vector3(ls.ambient.X * 3.0f, ls.ambient.Y * 3.0f, ls.ambient.Z * 3.0f); sky.blue_horizon = new Vector3(ls.horizon.X * 2.0f, ls.horizon.Y * 2.0f, ls.horizon.Z * 2.0f); - sky.blue_density = new Vector3(ls.blueDensity.X * 2.0f, ls.blueDensity.Y * 2.0f, ls.blueDensity.Z * 2.0f);; + sky.blue_density = new Vector3(ls.blueDensity.X * 2.0f, ls.blueDensity.Y * 2.0f, ls.blueDensity.Z * 2.0f); sky.haze_horizon = ls.hazeHorizon; sky.haze_density = ls.hazeDensity; sky.cloud_shadow = ls.cloudCoverage; diff --git a/OpenSim/Framework/ViewerSky.cs b/OpenSim/Framework/ViewerSky.cs index 10417f9547..aec85bec36 100644 --- a/OpenSim/Framework/ViewerSky.cs +++ b/OpenSim/Framework/ViewerSky.cs @@ -232,7 +232,7 @@ namespace OpenSim.Framework map["ambient"] = new Vector4(ambient.X, ambient.Y, ambient.Z, 1); map["blue_density"] = new Vector4(blue_density.X, blue_density.Y, blue_density.Z, 1); map["blue_horizon"] = new Vector4(blue_horizon.X, blue_horizon.Y, blue_horizon.Z, 1); - map["cloud_color"] = new Vector4(cloud_color.X, cloud_color.Y, cloud_color.Z, 1);; + map["cloud_color"] = new Vector4(cloud_color.X, cloud_color.Y, cloud_color.Z, 1); map["cloud_pos_density1"] = new Vector4(cloud_pos_density1.X, cloud_pos_density1.Y, cloud_pos_density1.Z, 1); map["cloud_pos_density2"] = new Vector4(cloud_pos_density2.X, cloud_pos_density2.Y, cloud_pos_density2.Z, 1); map["cloud_scale"] = new Vector4(cloud_scale, 0, 0, 1); diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index d3d8b86201..3c8566f86b 100755 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -313,7 +313,7 @@ namespace OpenSim + "1: Rotation (around the incoming OARs region center)\n" + "2: Cropping (a bounding cube with origin and size)\n" + "3: Displacement (setting offset coordinates within the destination region)", - LoadOar); ; + LoadOar); m_console.Commands.AddCommand("Archiving", false, "save oar", //"save oar [-v|--version=] [-p|--profile=] []", diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 0c2f4dcb6c..abc99a67c4 100755 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -3630,7 +3630,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP reply.Data.Flags = (byte)Util.ConvertAccessLevelToMaturity((byte)info.AccessLevel); if((land.Flags & (uint)ParcelFlags.ForSale) != 0) - reply.Data.Flags |= (byte)((1 << 7)); + reply.Data.Flags |= (1 << 7); if (land.IsGroupOwned) reply.Data.Flags |= 0x04; @@ -6504,7 +6504,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP LLSDxmlEncode2.AddElem("RegionDenyIdentified", false, sb); LLSDxmlEncode2.AddElem("RegionDenyTransacted", false, sb); LLSDxmlEncode2.AddElem("RegionPushOverride", (regionFlags & (uint)RegionFlags.RestrictPushObject) != 0, sb); - LLSDxmlEncode2.AddElem("RentPrice", (int) 0, sb);; + LLSDxmlEncode2.AddElem("RentPrice", (int) 0, sb); LLSDxmlEncode2.AddElem("RequestResult", request_result, sb); LLSDxmlEncode2.AddElem("SalePrice", landData.SalePrice, sb); LLSDxmlEncode2.AddElem("SelectedPrims", pc.Selected, sb); @@ -10514,7 +10514,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; // only do inventory not assets if (updatetask.AgentData.SessionID.NotEqual(m_sessionId) || updatetask.AgentData.AgentID.NotEqual(m_agentId)) - return; + return; TaskInventoryItem newTaskItem = new TaskInventoryItem { @@ -11803,7 +11803,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (eventInfoRequestPacket.AgentData.SessionID.NotEqual(m_sessionId) || eventInfoRequestPacket.AgentData.AgentID.NotEqual(m_agentId)) return; - OnEventInfoRequest?.Invoke(this, eventInfoRequestPacket.EventData.EventID); + OnEventInfoRequest?.Invoke(this, eventInfoRequestPacket.EventData.EventID); } #endregion @@ -12367,7 +12367,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleStartLure(Packet Pack) { if(OnStartLure is null) - return; + return; StartLurePacket startLureRequest = (StartLurePacket)Pack; if (startLureRequest.AgentData.SessionID.NotEqual(m_sessionId) || startLureRequest.AgentData.AgentID.NotEqual(m_agentId)) @@ -12648,7 +12648,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (packet.Type == PacketType.LogoutRequest) { if (((LogoutRequestPacket)packet).AgentData.SessionID.NotEqual(m_sessionId)) - return; + return; } Logout(this); } diff --git a/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs b/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs index 06864c0154..b1082c1e4a 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs @@ -111,7 +111,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { get { - return RequestedBurst * BurstModifier(); ; + return RequestedBurst * BurstModifier(); } } diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index f13decbbf6..1939895870 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs @@ -1122,7 +1122,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer if (OutSideViewRange && agentCircuit.ChildrenCapSeeds != null) agentCircuit.ChildrenCapSeeds.Remove(sp.RegionHandle); - string capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);; + string capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); // Let's create an agent there if one doesn't exist yet. // NOTE: logout will always be false for a non-HG teleport. @@ -2446,7 +2446,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer private void DoExpiration() { - List m_toRemove = new List();; + List m_toRemove = new List(); DateTime now = DateTime.UtcNow; lock (m_notFoundLocations) { diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index 89342b00af..a788d2951f 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs @@ -492,7 +492,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess // items directly under the root folder foreach (InventoryItemBase it in content.Items) - it.Name = it.Name + " (Unavailable)"; ; + it.Name = it.Name + " (Unavailable)"; // Send the new names client.SendBulkUpdateInventory(keep.ToArray(), content.Items.ToArray()); diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index 1aa32379ca..daad6741e9 100755 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs @@ -282,7 +282,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement public virtual List GetUserData(string query, int page_size, int page_number) { if(m_Scenes.Count <= 0 || m_userAccountService == null) - return new List();; + return new List(); var users = new List(); var found = new HashSet(); @@ -438,7 +438,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement { if (userdata.HasGridUserTried) { - ret[uuid] = userdata.FirstName + " " + userdata.LastName; ; + ret[uuid] = userdata.FirstName + " " + userdata.LastName; continue; } untried[uuid] = userdata; diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index dc703274e7..c3948f9a3a 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs @@ -1159,7 +1159,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver { Vector2 boundingOrigin = new(m_boundingOrigin.X, m_boundingOrigin.Y); Vector2 boundingSize = new(m_boundingSize.X, m_boundingSize.Y); - terrainModule.LoadFromStream(terrainPath, m_displacement, m_rotation, boundingOrigin, boundingSize, ms); ; + terrainModule.LoadFromStream(terrainPath, m_displacement, m_rotation, boundingOrigin, boundingSize, ms); } else { diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 01abbad577..f4b33af5f6 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs @@ -826,7 +826,7 @@ namespace OpenSim.Region.CoreModules.World.Estate thisSettings.AddEstateUser(user); thisSettings.RemoveBan(user); - changed[thisEstateID] = thisSettings;; + changed[thisEstateID] = thisSettings; if(needReply) sendAllowedOrBanList[remote_client] = invoice; @@ -847,7 +847,7 @@ namespace OpenSim.Region.CoreModules.World.Estate } thisSettings.RemoveEstateUser(user); - changed[thisEstateID] = thisSettings;; + changed[thisEstateID] = thisSettings; if(needReply) sendAllowedOrBanList[remote_client] = invoice; @@ -1419,11 +1419,11 @@ namespace OpenSim.Region.CoreModules.World.Estate } if (reportType != 0) - remoteClient.SendLandStatReply(reportType, requestFlags, 0, new LandStatReportItem[0]); ; + remoteClient.SendLandStatReply(reportType, requestFlags, 0, new LandStatReportItem[0]); IScriptModule scriptModule = Scene.RequestModuleInterface(); if (scriptModule == null) - remoteClient.SendLandStatReply(reportType, requestFlags, 0, new LandStatReportItem[0]); ; + remoteClient.SendLandStatReply(reportType, requestFlags, 0, new LandStatReportItem[0]); ICollection sceneData = scriptModule.GetTopObjectStats( 0.001f, 1024, out float totaltime, out float totalmemory); diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs index ce82c2658c..eaaaf877e4 100644 --- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs +++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs @@ -447,7 +447,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap Vector3[] FaceD = new Vector3[6]; // vertex D for Facei tScale = new Vector3(lscale.X, -lscale.Y, lscale.Z); - scale = ((tScale * rot)); + scale = tScale * rot; vertexes[0] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z))); // vertexes[0].x = pos.X + vertexes[0].x; //vertexes[0].y = pos.Y + vertexes[0].y; @@ -458,7 +458,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap FaceA[4] = vertexes[0]; tScale = lscale; - scale = ((tScale * rot)); + scale = tScale * rot; vertexes[1] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z))); // vertexes[1].x = pos.X + vertexes[1].x; @@ -470,7 +470,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap FaceC[4] = vertexes[1]; tScale = new Vector3(lscale.X, -lscale.Y, -lscale.Z); - scale = ((tScale * rot)); + scale = tScale * rot; vertexes[2] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z))); //vertexes[2].x = pos.X + vertexes[2].x; @@ -482,7 +482,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap FaceC[5] = vertexes[2]; tScale = new Vector3(lscale.X, lscale.Y, -lscale.Z); - scale = ((tScale * rot)); + scale = tScale * rot; vertexes[3] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z))); //vertexes[3].x = pos.X + vertexes[3].x; @@ -494,7 +494,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap FaceA[5] = vertexes[3]; tScale = new Vector3(-lscale.X, lscale.Y, lscale.Z); - scale = ((tScale * rot)); + scale = tScale * rot; vertexes[4] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z))); // vertexes[4].x = pos.X + vertexes[4].x; @@ -506,7 +506,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap FaceD[4] = vertexes[4]; tScale = new Vector3(-lscale.X, lscale.Y, -lscale.Z); - scale = ((tScale * rot)); + scale = tScale * rot; vertexes[5] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z))); // vertexes[5].x = pos.X + vertexes[5].x; @@ -518,7 +518,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap FaceB[5] = vertexes[5]; tScale = new Vector3(-lscale.X, -lscale.Y, lscale.Z); - scale = ((tScale * rot)); + scale = tScale * rot; vertexes[6] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z))); // vertexes[6].x = pos.X + vertexes[6].x; @@ -530,7 +530,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap FaceB[4] = vertexes[6]; tScale = new Vector3(-lscale.X, -lscale.Y, -lscale.Z); - scale = ((tScale * rot)); + scale = tScale * rot; vertexes[7] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z))); // vertexes[7].x = pos.X + vertexes[7].x; diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index a0bb8d6105..a04bed214b 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs @@ -1513,7 +1513,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap if(m_scene.RegionInfo.RegionSettings.Maturity == 2) responsemap["10"] = responsearr; else - responsemap["7"] = responsearr; + responsemap["7"] = responsearr; } } diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 85a310c59c..dab09e20ed 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -2598,7 +2598,7 @@ namespace OpenSim.Region.Framework.Scenes sceneObject.RootPart.CreatorIdentification = UserManagementModule.GetUserUUI(ownerID); - sceneObject.InvalidateDeepEffectivePerms();; + sceneObject.InvalidateDeepEffectivePerms(); sceneObject.ScheduleGroupForFullAnimUpdate(); return sceneObject; diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 9afa34bd63..00403fd47e 100755 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs @@ -302,9 +302,8 @@ namespace OpenSim.Region.Framework.Scenes Vector3 npos = sceneObject.RootPart.GroupPosition; bool clampZ = m_parentScene.ClampNegativeZ; - if (!(((sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim) && (sceneObject.RootPart.Shape.State != 0))) && (npos.X < 0.0 || npos.Y < 0.0 || (npos.Z < 0.0 && clampZ) || - npos.X > regionSizeX || - npos.Y > regionSizeY)) + if (!((sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim) && (sceneObject.RootPart.Shape.State != 0)) && (npos.X < 0.0 || npos.Y < 0.0 || (npos.Z < 0.0 && clampZ) || + npos.X > regionSizeX || npos.Y > regionSizeY)) { if (npos.X < 0.0) npos.X = 1.0f; if (npos.Y < 0.0) npos.Y = 1.0f; diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 4fdca98b67..528f6fa5a9 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -2125,7 +2125,7 @@ namespace OpenSim.Region.Framework.Scenes if ((!isPhantom || isPhysical || _VolumeDetectActive) && !ParentGroup.IsAttachmentCheckFull() - && !(Shape.PathCurve == (byte)Extrusion.Flexible)) + && (Shape.PathCurve != (byte)Extrusion.Flexible)) { AddToPhysics(isPhysical, isPhantom, building, isPhysical); UpdatePhysicsSubscribedEvents(); // not sure if appliable here @@ -3433,10 +3433,10 @@ namespace OpenSim.Region.Framework.Scenes { if (!AbsolutePosition.ApproxEquals(m_lastPosition, POSITION_TOLERANCE)) break; - if ( Math.Abs(m_lastVelocity.X) > 1e-4 || - Math.Abs(m_lastVelocity.Y) > 1e-4 || - Math.Abs(m_lastVelocity.Z) > 1e-4 - ) + if (Math.Abs(m_lastVelocity.X) > 1e-4 || + Math.Abs(m_lastVelocity.Y) > 1e-4 || + Math.Abs(m_lastVelocity.Z) > 1e-4 + ) break; } @@ -3445,11 +3445,11 @@ namespace OpenSim.Region.Framework.Scenes if (!angvel.ApproxEquals(tmp, ANGVELOCITY_TOLERANCE)) break; - if ( Math.Abs(AngularVelocity.X) < 1e-4 && - Math.Abs(AngularVelocity.Y) < 1e-4 && - Math.Abs(AngularVelocity.Z) < 1e-4 && - !RotationOffset.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) - ) + if (Math.Abs(AngularVelocity.X) < 1e-4 && + Math.Abs(AngularVelocity.Y) < 1e-4 && + Math.Abs(AngularVelocity.Z) < 1e-4 && + !RotationOffset.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) + ) break; return; @@ -4747,8 +4747,8 @@ namespace OpenSim.Region.Framework.Scenes DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. if(UsePhysics && !SetPhantom && m_localId == ParentGroup.RootPart.LocalId && - m_vehicleParams != null && m_vehicleParams.CameraDecoupled) - AddFlag(PrimFlags.CameraDecoupled); + m_vehicleParams != null && m_vehicleParams.CameraDecoupled) + AddFlag(PrimFlags.CameraDecoupled); else RemFlag(PrimFlags.CameraDecoupled); @@ -4786,7 +4786,7 @@ namespace OpenSim.Region.Framework.Scenes PhysicsActor pa; Vector3 velocity = Velocity; - Vector3 rotationalVelocity = AngularVelocity; ; + Vector3 rotationalVelocity = AngularVelocity; try { diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 0d2a0c05a7..fd87dfdb89 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -1999,7 +1999,7 @@ namespace OpenSim.Region.Framework.Scenes { ulong regionHandle = region.RegionHandle; m_knownChildRegions[regionHandle] = capsPath; - m_knownChildRegionsSizeInfo[regionHandle] = new spRegionSizeInfo(region.RegionSizeX, region.RegionSizeY); ; + m_knownChildRegionsSizeInfo[regionHandle] = new spRegionSizeInfo(region.RegionSizeX, region.RegionSizeY); } } @@ -2365,8 +2365,8 @@ namespace OpenSim.Region.Framework.Scenes if (p == this) continue; - if (ParcelHideThisAvatar && currentParcelUUID.NotEqual(p.currentParcelUUID) && !p.IsViewerUIGod) - continue; + if (ParcelHideThisAvatar && currentParcelUUID.NotEqual(p.currentParcelUUID) && !p.IsViewerUIGod) + continue; SendAppearanceToAgentNF(p); if (haveAnims) @@ -3097,7 +3097,7 @@ namespace OpenSim.Region.Framework.Scenes { if (!Flying) shouldfly = noFly ? false : (pos.Z > terrainHeight + Appearance.AvatarHeight); - LandAtTarget = landAtTarget & shouldfly; + LandAtTarget = landAtTarget && shouldfly; } else { @@ -4110,7 +4110,7 @@ namespace OpenSim.Region.Framework.Scenes else { //bool cacheCulling = (flags & 1) != 0; - bool cacheEmpty = (flags & 2) != 0;; + bool cacheEmpty = (flags & 2) != 0; EntityBase[] entities = Scene.Entities.GetEntities(); if(cacheEmpty) @@ -6125,7 +6125,7 @@ namespace OpenSim.Region.Framework.Scenes { // forcing telehubs on any tp that reachs this if ((m_teleportFlags & TeleHubTPFlags) != 0 || - (m_scene.TelehubAllowLandmarks == true ? false : ((m_teleportFlags & TeleportFlags.ViaLandmark) != 0 ))) + (m_scene.TelehubAllowLandmarks ? false : ((m_teleportFlags & TeleportFlags.ViaLandmark) != 0 ))) { ILandObject land; Vector3 teleHubPosition = telehub.AbsolutePosition; diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index f238777334..57552239ad 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs @@ -695,7 +695,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization private static void ProcessOffsetPosition(SceneObjectPart obj, XmlReader reader) { - obj.OffsetPosition = Util.ReadVector(reader, "OffsetPosition"); ; + obj.OffsetPosition = Util.ReadVector(reader, "OffsetPosition"); } private static void ProcessRotationOffset(SceneObjectPart obj, XmlReader reader) diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs index 2627ba40c0..07ecfe3dcd 100755 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs @@ -531,7 +531,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups default: client.SendInstantMessage(msg); - break;; + break; } } diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs index aaf38acef6..6c7ac942e6 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs @@ -521,7 +521,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups foreach (Hashtable groupFind in results.Values) { DirGroupsReplyData data = new DirGroupsReplyData(); - data.groupID = new UUID((string)groupFind["GroupID"]); ; + data.groupID = new UUID((string)groupFind["GroupID"]); data.groupName = (string)groupFind["Name"]; data.members = int.Parse((string)groupFind["Members"]); // data.searchOrder = order; diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs index 2d0c7d8fae..2ddb44cd66 100644 --- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs +++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs @@ -739,7 +739,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator float minscale = 0; if(!low && m_allowGrow) - minscale = copse.m_maximum_scale.Z * 0.75f;; + minscale = copse.m_maximum_scale.Z * 0.75f; int i = 0; UUID[] current = copse.m_trees.ToArray(); diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs b/OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs index 4e4ac2f433..fc03f1a218 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs @@ -1303,7 +1303,7 @@ namespace OpenSim.Region.PhysicsModule.BulletS capsuleShapeZ.SetMargin(world.WorldSettings.Params.collisionMargin); capsuleShapeZ.SetLocalScaling(ref scale); - return new BulletShapeXNA(capsuleShapeZ, BSPhysicsShapeType.SHAPE_CAPSULE); ; + return new BulletShapeXNA(capsuleShapeZ, BSPhysicsShapeType.SHAPE_CAPSULE); } public override BulletWorld Initialize(Vector3 maxPosition, ConfigurationParameters parms, diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs index 552955593c..2eb2ddcd23 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs @@ -1380,7 +1380,7 @@ namespace OpenSim.Region.PhysicsModule.BulletS break; case HollowShape.Circle: - hollowVolume *= 0.78539816339f;; + hollowVolume *= 0.78539816339f; break; case HollowShape.Triangle: diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs index 048af80fbc..1f1b5390bb 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs @@ -870,7 +870,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde } } else if (t > m_VhoverHeight) - perr = t - pos.Z; ; + perr = t - pos.Z; if ((m_flags & VehicleFlag.HOVER_UP_ONLY) == 0 || perr > -0.1) { diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs index f85f738540..2794f708d8 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs @@ -3990,7 +3990,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde float smass = part.mass; theobj.mass -= smass; - smass *= 1.0f / (theobj.mass); ; + smass *= 1.0f / (theobj.mass); theobj.c.X -= part.c.X * smass; theobj.c.Y -= part.c.Y * smass; diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs index 4210528fb7..68a9b7cba5 100644 --- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs +++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs @@ -895,7 +895,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing #endif try { - primMesh.Extrude(PathType.Linear); ; + primMesh.Extrude(PathType.Linear); } catch (Exception ex) { diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 8ab0b79d70..0419114c49 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -5754,7 +5754,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (item is LSL_Integer) return (LSL_Integer)item; else if (item is LSL_Float) - return Convert.ToInt32(((LSL_Float)item).value);; + return Convert.ToInt32(((LSL_Float)item).value); return new LSL_Integer(item.ToString()); } catch (FormatException) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs index 289d1e4927..f068d873fe 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs @@ -343,7 +343,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (!m_MODFunctionsEnabled) { MODShoutError("Module command functions not enabled"); - return UUID.Zero.ToString();; + return UUID.Zero.ToString(); } UUID req = UUID.Random(); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index b5b7faa148..3cc88414a8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -2367,7 +2367,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } NotecardCache.Cache(assetID, a.Data); - }; + } return assetID; } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 7c7c5539bc..9d1d99f3d5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs @@ -562,7 +562,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase public LSL_Key llObjectGetLinkKey(LSL_Key objectid, int linknum) { - return m_LSL_Functions.llObjectGetLinkKey(objectid, linknum);; + return m_LSL_Functions.llObjectGetLinkKey(objectid, linknum); } public LSL_String llGetLinkName(int linknum) diff --git a/OpenSim/Server/Handlers/AgentPreferences/AgentPreferencesServiceConnector.cs b/OpenSim/Server/Handlers/AgentPreferences/AgentPreferencesServiceConnector.cs index a581ea2d80..f9cf494cd4 100644 --- a/OpenSim/Server/Handlers/AgentPreferences/AgentPreferencesServiceConnector.cs +++ b/OpenSim/Server/Handlers/AgentPreferences/AgentPreferencesServiceConnector.cs @@ -56,7 +56,7 @@ namespace OpenSim.Server.Handlers.AgentPreferences Object[] args = new Object[] { config }; m_AgentPreferencesService = ServerUtils.LoadPlugin(service, args); - IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName); ; + IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName); server.AddStreamHandler(new AgentPreferencesServerPostHandler(m_AgentPreferencesService, auth)); } diff --git a/OpenSim/Server/Handlers/Estate/EstateDataRobustConnector.cs b/OpenSim/Server/Handlers/Estate/EstateDataRobustConnector.cs index 014fc3fb84..84c2cf458f 100644 --- a/OpenSim/Server/Handlers/Estate/EstateDataRobustConnector.cs +++ b/OpenSim/Server/Handlers/Estate/EstateDataRobustConnector.cs @@ -63,7 +63,7 @@ namespace OpenSim.Server.Handlers Object[] args = new Object[] { config }; IEstateDataService e_service = ServerUtils.LoadPlugin(service, args); - IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName); ; + IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName); server.AddStreamHandler(new EstateServerGetHandler(e_service, auth)); server.AddStreamHandler(new EstateServerPostHandler(e_service, auth)); diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index b0cb80f291..e919dd917b 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs @@ -180,7 +180,7 @@ namespace OpenSim.Services.Connectors.Hypergrid throw new Exception(string.Format("[USER AGENT CONNECTOR]: {0} call to {1} returned null", methodName, m_ServerURL)); } - return (Hashtable)response.Value; ; + return (Hashtable)response.Value; } public GridRegion GetHomeRegion(UUID userID, out Vector3 position, out Vector3 lookAt) diff --git a/OpenSim/Services/Connectors/MuteList/MuteListServicesConnector.cs b/OpenSim/Services/Connectors/MuteList/MuteListServicesConnector.cs index 337fc06c23..2a2fca1286 100644 --- a/OpenSim/Services/Connectors/MuteList/MuteListServicesConnector.cs +++ b/OpenSim/Services/Connectors/MuteList/MuteListServicesConnector.cs @@ -78,7 +78,7 @@ namespace OpenSim.Services.Connectors m_log.Error("[MUTELIST CONNECTOR]: No Server URI named in section GridUserService"); throw new Exception("MuteList connector init error"); } - m_ServerURI = serviceURI + "/mutelist";; + m_ServerURI = serviceURI + "/mutelist"; base.Initialise(source, "MuteListService"); } diff --git a/OpenSim/Services/InventoryService/LibraryService.cs b/OpenSim/Services/InventoryService/LibraryService.cs index c4779fc8b7..cb1c3d6cc9 100644 --- a/OpenSim/Services/InventoryService/LibraryService.cs +++ b/OpenSim/Services/InventoryService/LibraryService.cs @@ -213,7 +213,7 @@ namespace OpenSim.Services.InventoryService item.NextPermissions = (uint)config.GetLong("nextPermissions", m_NextPermissions); item.EveryOnePermissions = (uint)config.GetLong("everyonePermissions", m_EveryOnePermissions); item.BasePermissions = (uint)config.GetLong("basePermissions", m_BasePermissions); - item.GroupPermissions = (uint)config.GetLong("basePermissions", m_GroupPermissions);; + item.GroupPermissions = (uint)config.GetLong("basePermissions", m_GroupPermissions); item.Flags = (uint)config.GetInt("flags", 0); if (libraryFolders.TryGetValue(item.Folder, out InventoryFolderImpl parentFolder)) diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index 3297905c0c..9cb72cbd18 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs @@ -673,7 +673,7 @@ namespace OpenSim.Services.LLLoginService map["inventory-skeleton"] = ArrayListToOSDArray(agentInventory); map["inventory-skel-lib"] = ArrayListToOSDArray(inventoryLibrary); - map["inventory-root"] = ArrayListToOSDArray(inventoryRoot); ; + map["inventory-root"] = ArrayListToOSDArray(inventoryRoot); map["inventory-lib-root"] = ArrayListToOSDArray(inventoryLibRoot); map["inventory-lib-owner"] = ArrayListToOSDArray(inventoryLibraryOwner);