ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2025-06-20 04:38:51 +01:00
parent 157de21332
commit e1b5f3ad81
7 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -3631,7 +3631,8 @@ namespace OpenSim.Region.Framework.Scenes
if (target is not null && target2 is not null)
{
Vector3 direction = Vector3.Normalize(RayEnd - RayStart);
Vector3 direction = RayEnd - RayStart;
direction.Normalize();
//pos = target2.AbsolutePosition;
//m_log.Info("[OBJECT_REZ]: TargetPos: " + pos.ToString() + ", RayStart: " + RayStart.ToString() + ", RayEnd: " + RayEnd.ToString() + ", Volume: " + Util.GetDistanceTo(RayStart,RayEnd).ToString() + ", mag1: " + Util.GetMagnitude(RayStart).ToString() + ", mag2: " + Util.GetMagnitude(RayEnd).ToString());
@@ -3639,7 +3640,7 @@ namespace OpenSim.Region.Framework.Scenes
// TODO: Raytrace better here
//EntityIntersection ei = m_sceneGraph.GetClosestIntersectingPrim(new Ray(AXOrigin, AXdirection));
Ray NewRay = new(RayStart,direction);
Ray NewRay = new(RayStart, direction);
// Ray Trace against target here
EntityIntersection ei = target2.TestIntersectionOBB(NewRay, Quaternion.Identity, frontFacesOnly, CopyCenters);
@@ -4798,7 +4799,7 @@ Label_GroupsDone:
{
sp = GetScenePresence(agentID);
if (sp is null)
if (sp is null || sp.IsDeleted)
{
// If there is no scene presence, we may be handling a dead
// client. These can keep an avatar from reentering a region
@@ -4815,7 +4816,7 @@ Label_GroupsDone:
// need to try this again, bc client close may had not done it
m_authenticateHandler?.RemoveCircuit(agentID);
m_clientManager.Remove(agentID);
m_clientManager?.Remove(agentID);
m_capsModule?.RemoveCaps(agentID, 0);
return ret;

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -4771,7 +4771,7 @@ namespace OpenSim.Region.Framework.Scenes
return;
CopyFrom(cAgentData);
m_updateAgentReceivedAfterTransferEvent.Set();
m_updateAgentReceivedAfterTransferEvent?.Set();
}
private static Vector3 marker = new(-1f, -1f, -1f);