diff --git a/LibreMetaverse.LslTools/ObjectList.cs b/LibreMetaverse.LslTools/ObjectList.cs index 90da2946..250cc4a7 100644 --- a/LibreMetaverse.LslTools/ObjectList.cs +++ b/LibreMetaverse.LslTools/ObjectList.cs @@ -46,9 +46,7 @@ namespace LibreMetaverse { if (a == null || x < 0) return (object)null; - if (x == 0) - return a.it; - return this.Get0(a.next, x - 1); + return x == 0 ? a.it : this.Get0(a.next, x - 1); } public void Add(object o) diff --git a/LibreMetaverse.StructuredData/JSON/JsonMapper.cs b/LibreMetaverse.StructuredData/JSON/JsonMapper.cs index 25dfde63..12def1f1 100644 --- a/LibreMetaverse.StructuredData/JSON/JsonMapper.cs +++ b/LibreMetaverse.StructuredData/JSON/JsonMapper.cs @@ -33,13 +33,7 @@ namespace LitJson public Type ElementType { - get { - if (element_type == null) - return typeof (JsonData); - - return element_type; - } - + get { return element_type ?? typeof (JsonData); } set { element_type = value; } } @@ -55,13 +49,7 @@ namespace LitJson public Type ElementType { - get { - if (element_type == null) - return typeof (JsonData); - - return element_type; - } - + get { return element_type ?? typeof (JsonData); } set { element_type = value; } } diff --git a/LibreMetaverse.StructuredData/JSON/JsonReader.cs b/LibreMetaverse.StructuredData/JSON/JsonReader.cs index c321d19c..c00c4080 100644 --- a/LibreMetaverse.StructuredData/JSON/JsonReader.cs +++ b/LibreMetaverse.StructuredData/JSON/JsonReader.cs @@ -412,10 +412,7 @@ namespace LitJson throw new JsonException ( "Input doesn't evaluate to proper JSON text"); - if (parser_return) - return true; - - return false; + return parser_return; } continue; diff --git a/LibreMetaverse.StructuredData/StructuredData.cs b/LibreMetaverse.StructuredData/StructuredData.cs index 1b7a64ba..a2eba332 100644 --- a/LibreMetaverse.StructuredData/StructuredData.cs +++ b/LibreMetaverse.StructuredData/StructuredData.cs @@ -296,21 +296,15 @@ namespace OpenMetaverse.StructuredData } if (type == typeof(Vector3)) { - if (value.Type == OSDType.Array) - return ((OSDArray)value).AsVector3(); - return Vector3.Zero; + return value.Type == OSDType.Array ? ((OSDArray)value).AsVector3() : Vector3.Zero; } if (type == typeof(Vector4)) { - if (value.Type == OSDType.Array) - return ((OSDArray)value).AsVector4(); - return Vector4.Zero; + return value.Type == OSDType.Array ? ((OSDArray)value).AsVector4() : Vector4.Zero; } if (type == typeof(Quaternion)) { - if (value.Type == OSDType.Array) - return ((OSDArray)value).AsQuaternion(); - return Quaternion.Identity; + return value.Type == OSDType.Array ? ((OSDArray)value).AsQuaternion() : Quaternion.Identity; } if (type == typeof(OSDArray)) { diff --git a/LibreMetaverse.Voice/VoiceManager.cs b/LibreMetaverse.Voice/VoiceManager.cs index a34736f9..b28258f9 100644 --- a/LibreMetaverse.Voice/VoiceManager.cs +++ b/LibreMetaverse.Voice/VoiceManager.cs @@ -180,9 +180,7 @@ namespace LibreMetaverse.Voice public bool ConnectToDaemon() { - if (!Enabled) return false; - - return ConnectToDaemon("127.0.0.1", DAEMON_PORT); + return Enabled && ConnectToDaemon("127.0.0.1", DAEMON_PORT); } public bool ConnectToDaemon(string address, int port) diff --git a/LibreMetaverse.Voice/VoiceSession.cs b/LibreMetaverse.Voice/VoiceSession.cs index 340c997c..3cbcff4c 100644 --- a/LibreMetaverse.Voice/VoiceSession.cs +++ b/LibreMetaverse.Voice/VoiceSession.cs @@ -138,10 +138,7 @@ namespace LibreMetaverse.Voice /// private VoiceParticipant FindParticipant(string puri) { - if (_knownParticipants.ContainsKey(puri)) - return _knownParticipants[puri]; - - return null; + return _knownParticipants.ContainsKey(puri) ? _knownParticipants[puri] : null; } public void Set3DPosition(VoicePosition speakerPosition, VoicePosition listenerPosition) diff --git a/LibreMetaverse/AssetCache.cs b/LibreMetaverse/AssetCache.cs index 168b2ce3..63fac615 100644 --- a/LibreMetaverse/AssetCache.cs +++ b/LibreMetaverse/AssetCache.cs @@ -266,10 +266,7 @@ namespace OpenMetaverse string fileName = FileName(assetID); - if (File.Exists(fileName)) - return fileName; - else - return null; + return File.Exists(fileName) ? fileName : null; } /// diff --git a/LibreMetaverse/BVHDecoder.cs b/LibreMetaverse/BVHDecoder.cs index 0fbd23de..863c31dd 100644 --- a/LibreMetaverse/BVHDecoder.cs +++ b/LibreMetaverse/BVHDecoder.cs @@ -373,9 +373,8 @@ namespace OpenMetaverse { if (ReferenceEquals(null, obj)) return false; if (ReferenceEquals(this, obj)) return true; - if (obj.GetType() != typeof(BinBVHAnimationReader)) return false; - return Equals((BinBVHAnimationReader)obj); - } + return obj.GetType() == typeof(BinBVHAnimationReader) && Equals((BinBVHAnimationReader)obj); + } /// /// Serves as a hash function for a particular type. @@ -464,8 +463,7 @@ namespace OpenMetaverse public override bool Equals(object obj) { if (ReferenceEquals(null, obj)) return false; - if (obj.GetType() != typeof(binBVHJoint)) return false; - return Equals((binBVHJoint)obj); + return obj.GetType() == typeof(binBVHJoint) && Equals((binBVHJoint)obj); } /// diff --git a/LibreMetaverse/CoordinateFrame.cs b/LibreMetaverse/CoordinateFrame.cs index a03ee77e..764330fb 100644 --- a/LibreMetaverse/CoordinateFrame.cs +++ b/LibreMetaverse/CoordinateFrame.cs @@ -265,10 +265,7 @@ namespace OpenMetaverse protected bool IsFinite() { - if (xAxis.IsFinite() && yAxis.IsFinite() && zAxis.IsFinite()) - return true; - else - return false; + return xAxis.IsFinite() && yAxis.IsFinite() && zAxis.IsFinite(); } protected void Orthonormalize() diff --git a/LibreMetaverse/GridClient.cs b/LibreMetaverse/GridClient.cs index 28b14ad2..3912cf81 100644 --- a/LibreMetaverse/GridClient.cs +++ b/LibreMetaverse/GridClient.cs @@ -147,10 +147,7 @@ namespace OpenMetaverse AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip, ServerCertificateCustomValidationCallback = (message, cert, chain, sslPolicyErrors) => { - if (sslPolicyErrors == SslPolicyErrors.None) - { - return true; - } + if (sslPolicyErrors == SslPolicyErrors.None) { return true; } // *HACK: return true; diff --git a/LibreMetaverse/InventoryNodeDictionary.cs b/LibreMetaverse/InventoryNodeDictionary.cs index 9dd7a310..99942a1f 100644 --- a/LibreMetaverse/InventoryNodeDictionary.cs +++ b/LibreMetaverse/InventoryNodeDictionary.cs @@ -67,11 +67,7 @@ namespace OpenMetaverse private InventoryNode Get(UUID uuid) { InventoryNode val; - if (Dictionary.TryGetValue(uuid, out val)) - { - return val; - } - return null; + return Dictionary.TryGetValue(uuid, out val) ? val : null; } static int NullCompare(object o1, object o2) diff --git a/LibreMetaverse/PacketDecoder.cs b/LibreMetaverse/PacketDecoder.cs index 44f8cfc5..c92ce76a 100644 --- a/LibreMetaverse/PacketDecoder.cs +++ b/LibreMetaverse/PacketDecoder.cs @@ -757,14 +757,9 @@ namespace OpenMetaverse.Packets { byte[] bytes = (byte[]) fieldData; - if (bytes.Length == 17) - { - return $"{fieldName,30}: {new UUID((byte[]) fieldData, 0),-40} [UUID]"; - } - else - { - return $"{fieldName,30}: {Utils.BytesToString((byte[]) fieldData),-40} [Byte[]]"; - } + return bytes.Length == 17 + ? $"{fieldName,30}: {new UUID((byte[]) fieldData, 0),-40} [UUID]" + : $"{fieldName,30}: {Utils.BytesToString((byte[]) fieldData),-40} [Byte[]]"; } private static string DecodeNameValue(string fieldName, object fieldData) diff --git a/LibreMetaverse/Primitives/TextureEntry.cs b/LibreMetaverse/Primitives/TextureEntry.cs index 2b2436ef..7f2605f5 100644 --- a/LibreMetaverse/Primitives/TextureEntry.cs +++ b/LibreMetaverse/Primitives/TextureEntry.cs @@ -215,13 +215,7 @@ namespace OpenMetaverse /// internal byte material { - get - { - if ((hasAttribute & TextureAttributes.Material) != 0) - return materialb; - else - return DefaultTexture.material; - } + get { return (hasAttribute & TextureAttributes.Material) != 0 ? materialb : DefaultTexture.material; } set { materialb = value; @@ -232,13 +226,7 @@ namespace OpenMetaverse /// internal byte media { - get - { - if ((hasAttribute & TextureAttributes.Media) != 0) - return mediab; - else - return DefaultTexture.media; - } + get { return (hasAttribute & TextureAttributes.Media) != 0 ? mediab : DefaultTexture.media; } set { mediab = value; @@ -249,13 +237,7 @@ namespace OpenMetaverse /// public Color4 RGBA { - get - { - if ((hasAttribute & TextureAttributes.RGBA) != 0) - return rgba; - else - return DefaultTexture.rgba; - } + get { return (hasAttribute & TextureAttributes.RGBA) != 0 ? rgba : DefaultTexture.rgba; } set { rgba = value; @@ -266,13 +248,7 @@ namespace OpenMetaverse /// public float RepeatU { - get - { - if ((hasAttribute & TextureAttributes.RepeatU) != 0) - return repeatU; - else - return DefaultTexture.repeatU; - } + get { return (hasAttribute & TextureAttributes.RepeatU) != 0 ? repeatU : DefaultTexture.repeatU; } set { repeatU = value; @@ -283,13 +259,7 @@ namespace OpenMetaverse /// public float RepeatV { - get - { - if ((hasAttribute & TextureAttributes.RepeatV) != 0) - return repeatV; - else - return DefaultTexture.repeatV; - } + get { return (hasAttribute & TextureAttributes.RepeatV) != 0 ? repeatV : DefaultTexture.repeatV; } set { repeatV = value; @@ -300,13 +270,7 @@ namespace OpenMetaverse /// public float OffsetU { - get - { - if ((hasAttribute & TextureAttributes.OffsetU) != 0) - return offsetU; - else - return DefaultTexture.offsetU; - } + get { return (hasAttribute & TextureAttributes.OffsetU) != 0 ? offsetU : DefaultTexture.offsetU; } set { offsetU = value; @@ -317,13 +281,7 @@ namespace OpenMetaverse /// public float OffsetV { - get - { - if ((hasAttribute & TextureAttributes.OffsetV) != 0) - return offsetV; - else - return DefaultTexture.offsetV; - } + get { return (hasAttribute & TextureAttributes.OffsetV) != 0 ? offsetV : DefaultTexture.offsetV; } set { offsetV = value; @@ -334,13 +292,7 @@ namespace OpenMetaverse /// public float Rotation { - get - { - if ((hasAttribute & TextureAttributes.Rotation) != 0) - return rotation; - else - return DefaultTexture.rotation; - } + get { return (hasAttribute & TextureAttributes.Rotation) != 0 ? rotation : DefaultTexture.rotation; } set { rotation = value; @@ -351,13 +303,7 @@ namespace OpenMetaverse /// public float Glow { - get - { - if ((hasAttribute & TextureAttributes.Glow) != 0) - return glow; - else - return DefaultTexture.glow; - } + get { return (hasAttribute & TextureAttributes.Glow) != 0 ? glow : DefaultTexture.glow; } set { glow = value; diff --git a/Programs/examples/TestClient/Commands/Inventory/DownloadCommand.cs b/Programs/examples/TestClient/Commands/Inventory/DownloadCommand.cs index 7a78a86d..f9afe2bd 100644 --- a/Programs/examples/TestClient/Commands/Inventory/DownloadCommand.cs +++ b/Programs/examples/TestClient/Commands/Inventory/DownloadCommand.cs @@ -46,10 +46,8 @@ namespace OpenMetaverse.TestClient if (DownloadHandle.WaitOne(120 * 1000, false)) { - if (Success) - return $"Saved {AssetID}.{assetType.ToString().ToLower()}"; - else - return $"Failed to download asset {AssetID}, perhaps {assetType} is the incorrect asset type?"; + return Success ? $"Saved {AssetID}.{assetType.ToString().ToLower()}" + : $"Failed to download asset {AssetID}, perhaps {assetType} is the incorrect asset type?"; } else { diff --git a/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs b/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs index 1f2b27cf..6f3855c2 100644 --- a/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs +++ b/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs @@ -67,14 +67,9 @@ namespace OpenMetaverse.TestClient start = DateTime.Now; DoUpload(jpeg2k, inventoryName); - if (UploadCompleteEvent.WaitOne((int)timeout, false)) - { - return $"Texture upload {((TextureID != UUID.Zero) ? "succeeded" : "failed")}: {TextureID}"; - } - else - { - return "Texture upload timed out"; - } + return UploadCompleteEvent.WaitOne((int)timeout, false) + ? $"Texture upload {((TextureID != UUID.Zero) ? "succeeded" : "failed")}: {TextureID}" + : "Texture upload timed out"; } private void DoUpload(byte[] UploadData, string FileName) diff --git a/Programs/examples/TestClient/Commands/Movement/FollowCommand.cs b/Programs/examples/TestClient/Commands/Movement/FollowCommand.cs index 8a3fcb5f..730a0ba3 100644 --- a/Programs/examples/TestClient/Commands/Movement/FollowCommand.cs +++ b/Programs/examples/TestClient/Commands/Movement/FollowCommand.cs @@ -33,11 +33,9 @@ namespace OpenMetaverse.TestClient } else { - if (Follow(target)) { - return $"Following {target}."; - } else { - return $"Unable to follow {target}. Client may not be able to see the target avatar."; - } + return Follow(target) + ? $"Following {target}." + : $"Unable to follow {target}. Client may not be able to see the target avatar."; } } diff --git a/Programs/examples/TestClient/Commands/Movement/GoHome.cs b/Programs/examples/TestClient/Commands/Movement/GoHome.cs index 1693759e..332a1089 100644 --- a/Programs/examples/TestClient/Commands/Movement/GoHome.cs +++ b/Programs/examples/TestClient/Commands/Movement/GoHome.cs @@ -11,11 +11,7 @@ namespace OpenMetaverse.TestClient public override string Execute(string[] args, UUID fromAgentID) { - if ( Client.Self.GoHome() ) { - return "Teleport Home Succesful"; - } else { - return "Teleport Home Failed"; - } + return Client.Self.GoHome() ? "Teleport Home Succesful" : "Teleport Home Failed"; } } } diff --git a/Programs/examples/TestClient/Commands/Movement/GotoLandmark.cs b/Programs/examples/TestClient/Commands/Movement/GotoLandmark.cs index bfa62253..f2505c43 100644 --- a/Programs/examples/TestClient/Commands/Movement/GotoLandmark.cs +++ b/Programs/examples/TestClient/Commands/Movement/GotoLandmark.cs @@ -23,18 +23,9 @@ namespace OpenMetaverse.TestClient { return "Invalid UUID"; } - else - { - Console.WriteLine("Teleporting to " + landmark); - } - if (Client.Self.Teleport(landmark)) - { - return "Teleport Successful"; - } - else - { - return "Teleport Failed"; - } + + Console.WriteLine("Teleporting to " + landmark); + return Client.Self.Teleport(landmark) ? "Teleport Successful" : "Teleport Failed"; } } } diff --git a/Programs/examples/TestClient/Commands/System/MD5Command.cs b/Programs/examples/TestClient/Commands/System/MD5Command.cs index 7070be33..5656e519 100644 --- a/Programs/examples/TestClient/Commands/System/MD5Command.cs +++ b/Programs/examples/TestClient/Commands/System/MD5Command.cs @@ -11,10 +11,7 @@ namespace OpenMetaverse.TestClient public override string Execute(string[] args, UUID fromAgentID) { - if (args.Length == 1) - return Utils.MD5(args[0]); - else - return "Usage: md5 [password]"; + return args.Length == 1 ? Utils.MD5(args[0]) : "Usage: md5 [password]"; } } }