From 0652f01d4cbae9585f4288b68d1feff1711d6be4 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 5 Apr 2019 03:45:27 +0100 Subject: [PATCH] duhhh npcs don't have child agents; plus minor typos --- .../Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 2 +- .../Linden/Caps/BunchOfCaps/MeshCost.cs | 2 +- .../ClientStack/Linden/UDP/LLClientView.cs | 2 +- .../Region/Framework/Scenes/ScenePresence.cs | 17 ++++++++++++----- .../Region/Framework/Scenes/SimStatsReporter.cs | 2 +- .../Region/PhysicsModules/ubOde/ODECharacter.cs | 2 +- runprebuild.bat | 4 +++- 7 files changed, 20 insertions(+), 11 deletions(-) diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index deeacf5b58..ea68581f33 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs @@ -505,7 +505,7 @@ namespace OpenSim.Region.ClientStack.Linden case FileAgentInventoryState.processRequest: case FileAgentInventoryState.processUpload: LLSDAssetUploadError resperror = new LLSDAssetUploadError(); - resperror.message = "Uploader busy processing previus request"; + resperror.message = "Uploader busy processing previous request"; resperror.identifier = UUID.Zero; LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse(); diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs index cf5f0ef15b..9b8f11a52b 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs @@ -724,7 +724,7 @@ namespace OpenSim.Region.ClientStack.Linden int m = curCost.medLODSize - 384; int h = curCost.highLODSize - 384; - // use previus higher LOD size on missing ones + // use previous higher LOD size on missing ones if (m <= 0) m = h; if (l <= 0) diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 8d5980a22e..a1d2e11551 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -929,7 +929,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP //BillableFactor zc.AddFloat(es.BillableFactor); //CacheID - zc.AddUUID(regionInfo.CacheID); // needs review when we actuall support cache + zc.AddUUID(regionInfo.CacheID); //TerrainBase0 //TerrainBase1 //TerrainBase2 diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 438ae4cb5f..f9d1f54b46 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -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) diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs index bc440fc144..50b0cb5571 100755 --- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs @@ -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; diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs index 7ad5e3ddb1..267fc5b458 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs @@ -1603,7 +1603,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde } else { - Vector3 a = _velocity; // previus velocity + Vector3 a = _velocity; // previous velocity SetSmooth(ref _velocity,ref vel,2); a = (_velocity - a) * invtimeStep; SetSmooth(ref _acceleration,ref a,2); diff --git a/runprebuild.bat b/runprebuild.bat index e5d7cb882c..0bee6f5781 100755 --- a/runprebuild.bat +++ b/runprebuild.bat @@ -54,6 +54,8 @@ goto :done :found @echo Found msbuild at %ValueValue% @echo Creating compile.bat +rem To compile in debug mode @echo %ValueValue% opensim.sln > compile.bat - +rem To compile in release mode comment line (add rem to start) above and uncomment next (remove rem) +rem @echo %ValueValue% /P:Config=Release opensim.sln > compile.bat :done \ No newline at end of file