diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index 131416d5d7..2a2f1f0447 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs @@ -1336,8 +1336,7 @@ namespace OpenSim.Framework } else if (WebUtil.DebugLevel >= 4) { - m_log.DebugFormat("[LOGHTTP]: HTTP OUT {0} took {1}ms", - reqnum, tickdiff); + m_log.DebugFormat("[LOGHTTP]: HTTP OUT {0} took {1}ms", reqnum, tickdiff); } return deserial; } @@ -1347,7 +1346,7 @@ namespace OpenSim.Framework int reqnum = WebUtil.RequestNumber++; if (WebUtil.DebugLevel >= 3) - m_log.DebugFormat("[LOGHTTP]: HTTP OUT {0} SRestObjReq GET {2}", reqnum, requestUrl); + m_log.DebugFormat("[LOGHTTP]: HTTP OUT {0} SRestObjReq GET {1}", reqnum, requestUrl); int tickstart = Util.EnvironmentTickCount(); TResponse deserial = default(TResponse); diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs index 078b6ad6ac..ca2be8edbc 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs @@ -287,14 +287,12 @@ namespace OpenSim.Region.PhysicsModules.SharedBase /// Method to call when the raycast is complete public virtual void RaycastWorld(Vector3 position, Vector3 direction, float length, RaycastCallback retMethod) { - if (retMethod != null) - retMethod(false, Vector3.Zero, 0, 999999999999f, Vector3.Zero); + retMethod?.Invoke(false, Vector3.Zero, 0, 999999999999f, Vector3.Zero); } public virtual void RaycastWorld(Vector3 position, Vector3 direction, float length, int Count, RayCallback retMethod) { - if (retMethod != null) - retMethod(new List()); + retMethod?.Invoke(new List()); } public virtual List RaycastWorld(Vector3 position, Vector3 direction, float length, int Count) diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll index cbea8c538c..69b4eb2081 100755 Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ