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

duhhh npcs don't have child agents; plus minor typos

Browse Source
This commit is contained in:
UbitUmarov
2019-04-05 03:45:27 +01:00
parent 8d272fb1d0
commit 0652f01d4c
7 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3072,10 +3072,14 @@ namespace OpenSim.Region.Framework.Scenes
Vector2 regionSize;
regionSize = new Vector2(m_scene.RegionInfo.RegionSizeX, m_scene.RegionInfo.RegionSizeY);
if (pos.X < 0 || pos.X >= regionSize.X
|| pos.Y < 0 || pos.Y >= regionSize.Y
|| pos.Z < 0)
return;
if (pos.X < 0.5f)
pos.X = 0.5f;
else if (pos.X > regionSize.X - 0.5f)
pos.X = regionSize.X - 0.5f;
if (pos.Y < 0.5f)
pos.Y = 0.5f;
else if (pos.Y > regionSize.Y - 0.5f)
pos.Y = regionSize.Y - 0.5f;
float terrainHeight;
Scene targetScene = m_scene;
@@ -4405,6 +4409,9 @@ namespace OpenSim.Region.Framework.Scenes
m_scene.EventManager.TriggerSignificantClientMovement(this);
}
if(IsNPC)
return;
// updates priority recalc
checkRePrioritization();
@@ -6720,7 +6727,7 @@ namespace OpenSim.Region.Framework.Scenes
if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive)
continue;
// only those on previus parcel need receive kills
// only those on previous parcel need receive kills
if (previusParcelID == p.currentParcelUUID)
{
if(!p.IsViewerUIGod)

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

@@ -556,7 +556,7 @@ namespace OpenSim.Region.Framework.Scenes
sb[27].StatID = (uint)Stats.PhysicsLodTasks;
sb[27].StatValue = 0;
sb[28].StatID = (uint)Stats.ScriptEps; // we actuall have this, but not messing array order AGAIN
sb[28].StatID = (uint)Stats.ScriptEps; // we actually have this, but not messing array order AGAIN
sb[28].StatValue = (float)Math.Round(m_scriptEventsPerSecond * updateTimeFactor);
sb[29].StatID = (uint)Stats.SimAIStepTimeMS;