From eafc01cf8ffcceceac1ea8a6ada3d0ffab300109 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 6 May 2011 09:08:24 -0700 Subject: Bug fix: iars under Library weren't being loaded. --- OpenSim/Region/Framework/Scenes/Scene.cs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'OpenSim/Region/Framework') diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index b537381..49fbe33 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -775,6 +775,8 @@ namespace OpenSim.Region.Framework.Scenes m_regInfo = regInfo; m_eventManager = new EventManager(); + m_permissions = new ScenePermissions(this); + m_lastUpdate = Util.EnvironmentTickCount(); } -- cgit v1.1 From 74e981e796d28f52458acf3ebfc40fbde54e22db Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 6 May 2011 09:56:27 -0700 Subject: One more bug fix concerning library items that weren't being copied to user's inventory. Also commented verbose debug message. --- OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Region/Framework') diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index b0f0de6..cd01a05 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -713,7 +713,7 @@ namespace OpenSim.Region.Framework.Scenes newName = item.Name; } - if (remoteClient.AgentId == oldAgentID) + if (remoteClient.AgentId == oldAgentID || (LibraryService != null && LibraryService.LibraryRootFolder != null && oldAgentID == LibraryService.LibraryRootFolder.Owner)) { CreateNewInventoryItem( remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType, -- cgit v1.1 From 04ecd748d98e5b66446912debe06af6975e66560 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 6 May 2011 22:47:41 +0100 Subject: remove further mono compiler warnings --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Region/Framework') diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 631c91b..ae4bd17 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -3151,7 +3151,7 @@ namespace OpenSim.Region.Framework.Scenes { cAgent.AttachmentObjects = new List(); cAgent.AttachmentObjectStates = new List(); - IScriptModule se = m_scene.RequestModuleInterface(); +// IScriptModule se = m_scene.RequestModuleInterface(); m_InTransitScriptStates.Clear(); foreach (SceneObjectGroup sog in m_attachments) { -- cgit v1.1 From eaa33cf478070bcc45f43c84a3145e8f2e016ea9 Mon Sep 17 00:00:00 2001 From: dahlia Date: Fri, 6 May 2011 16:56:54 -0700 Subject: adjust avatar terse update packet filter distance error threshold based on avatar speed --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/Framework') diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index ae4bd17..f6295b1 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -2430,8 +2430,12 @@ namespace OpenSim.Region.Framework.Scenes float speed = Velocity.Length(); float velocidyDiff = Vector3.Distance(lastVelocitySentToAllClients, Velocity); + // assuming 5 ms. worst case precision for timer, use 2x that + // for distance error threshold + float distanceErrorThreshold = speed * 0.01f; + if (speed < 0.01f // allow rotation updates if avatar position is unchanged - || Math.Abs(distanceError) > 0.25f // arbitrary distance error threshold + || Math.Abs(distanceError) > distanceErrorThreshold || velocidyDiff > 0.01f) // did velocity change from last update? { m_perfMonMS = currentTick; -- cgit v1.1