ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix a http SRestObjReq log message, thx Tampa (also a libomv update)

Browse Source
This commit is contained in:
UbitUmarov
2022-04-14 22:28:02 +01:00
parent 37ab7afed9
commit d0d71317e0
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/WebUtil.cs
View File

@@ -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);

6
OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
View File

@@ -287,14 +287,12 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
/// <param name="retMethod">Method to call when the raycast is complete</param>
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<ContactResult>());
retMethod?.Invoke(new List<ContactResult>());
}
public virtual List<ContactResult> RaycastWorld(Vector3 position, Vector3 direction, float length, int Count)

BIN
bin/OpenMetaverseTypes.dll
View File

Binary file not shown.