From efd6fb05a9f3805ce19dc432b6d084497cd45573 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 17 Nov 2018 17:05:28 +0000 Subject: [PATCH] code aesthetics --- .../Addons/Groups/Service/GroupsService.cs | 2 +- .../LoadRegions/RegionLoaderWebServer.cs | 2 +- OpenSim/Framework/Util.cs | 2 +- .../Transfer/InventoryTransferModule.cs | 4 +- .../Region/ScriptEngine/Shared/LSL_Types.cs | 52 +++++++++++++------ 5 files changed, 42 insertions(+), 20 deletions(-) diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs index bed91d9666..0792a470e3 100644 --- a/OpenSim/Addons/Groups/Service/GroupsService.cs +++ b/OpenSim/Addons/Groups/Service/GroupsService.cs @@ -492,7 +492,7 @@ namespace OpenSim.Groups // check permissions bool limited = HasPower(RequestingAgentID, GroupID, GroupPowers.AssignMemberLimited); - bool unlimited = HasPower(RequestingAgentID, GroupID, GroupPowers.AssignMember) | IsOwner(RequestingAgentID, GroupID); + bool unlimited = HasPower(RequestingAgentID, GroupID, GroupPowers.AssignMember) || IsOwner(RequestingAgentID, GroupID); if (!limited && !unlimited) { m_log.DebugFormat("[Groups]: ({0}) Attempt at assigning {1} to role {2} denied because of lack of permission", RequestingAgentID, AgentID, RoleID); diff --git a/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs index 13d7a8ad4e..2cfd4938c1 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs @@ -122,7 +122,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions throw ex; } - if (regionCount > 0 | allowRegionless) + if (regionCount > 0 || allowRegionless) return regionInfos; m_log.Debug("[WEBLOADER]: Request yielded no regions."); diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 6e0d30d94c..f8469b6667 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -899,7 +899,7 @@ namespace OpenSim.Framework /// public static bool IsInsideBox(Vector3 v, Vector3 min, Vector3 max) { - return v.X >= min.X & v.Y >= min.Y && v.Z >= min.Z + return v.X >= min.X && v.Y >= min.Y && v.Z >= min.Z && v.X <= max.X && v.Y <= max.Y && v.Z <= max.Z; } diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 5d7f25c147..abeed5beec 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs @@ -396,7 +396,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer { folder = invService.GetFolder(client.AgentId, inventoryID); - if (folder != null & trashFolder != null) + if (folder != null && trashFolder != null) { previousParentFolderID = folder.ParentID; folder.ParentID = trashFolder.ID; @@ -405,7 +405,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer } } - if ((null == item && null == folder) | null == trashFolder) + if ((null == item && null == folder) || null == trashFolder) { string reason = String.Empty; diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index e9ee9371bc..0331a4c238 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs @@ -84,16 +84,26 @@ namespace OpenSim.Region.ScriptEngine.Shared { str = str.Replace('<', ' '); str = str.Replace('>', ' '); - string[] tmps = str.Split(new Char[] { ',', '<', '>' }); + string[] tmps = str.Split(new Char[] {','}); if (tmps.Length < 3) { - x=y=z=0; + z = y = x = 0; return; } - bool res; - res = Double.TryParse(tmps[0], NumberStyles.Float, Culture.NumberFormatInfo, out x); - res = res & Double.TryParse(tmps[1], NumberStyles.Float, Culture.NumberFormatInfo, out y); - res = res & Double.TryParse(tmps[2], NumberStyles.Float, Culture.NumberFormatInfo, out z); + if (!Double.TryParse(tmps[0], NumberStyles.Float, Culture.NumberFormatInfo, out x)) + { + z = y = 0; + return; + } + if (!Double.TryParse(tmps[1], NumberStyles.Float, Culture.NumberFormatInfo, out y)) + { + z = x = 0; + return; + } + if (!Double.TryParse(tmps[2], NumberStyles.Float, Culture.NumberFormatInfo, out z)) + { + y = x = 0; + } } #endregion @@ -364,19 +374,31 @@ namespace OpenSim.Region.ScriptEngine.Shared { str = str.Replace('<', ' '); str = str.Replace('>', ' '); - string[] tmps = str.Split(new Char[] { ',', '<', '>' }); - if (tmps.Length < 4) + string[] tmps = str.Split(new Char[] {','}); + if (tmps.Length < 4 || + !Double.TryParse(tmps[3], NumberStyles.Float, Culture.NumberFormatInfo, out s)) { - x=y=z=s=0; + z = y = x = 0; + s = 1; return; } - bool res; - res = Double.TryParse(tmps[0], NumberStyles.Float, Culture.NumberFormatInfo, out x); - res = res & Double.TryParse(tmps[1], NumberStyles.Float, Culture.NumberFormatInfo, out y); - res = res & Double.TryParse(tmps[2], NumberStyles.Float, Culture.NumberFormatInfo, out z); - res = res & Double.TryParse(tmps[3], NumberStyles.Float, Culture.NumberFormatInfo, out s); - if (s == 0 && x == 0 && y == 0 && z == 0) + if (!Double.TryParse(tmps[0], NumberStyles.Float, Culture.NumberFormatInfo, out x)) + { + z = y = 0; s = 1; + return; + } + if (!Double.TryParse(tmps[1], NumberStyles.Float, Culture.NumberFormatInfo, out y)) + { + z = x = 0; + s = 1; + return; + } + if (!Double.TryParse(tmps[2], NumberStyles.Float, Culture.NumberFormatInfo, out z)) + { + y = x = 0; + s = 1; + } } public Quaternion(OMV_Quaternion rot)