From ef43f98686b8b6530f9e04bf6e0cdc6b72328fa2 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Sat, 18 Dec 2010 00:45:56 +0000 Subject: Raise maximum iar version that master can load to 1.x, so that it can load its own iars (oops) --- .../Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index acf2c3e..6030706 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs @@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// The maximum major version of archive that we can read. Minor versions shouldn't need a max number since version /// bumps here should be compatible. /// - public static int MAX_MAJOR_VERSION = 0; + public static int MAX_MAJOR_VERSION = 1; protected TarArchiveReader archive; -- cgit v1.1 From bf9555eaee34da11bba3d191b3ba37e2a681fde7 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Sat, 18 Dec 2010 00:57:09 +0000 Subject: minor: add [-p|--profile=] to usage line that pops up if save iar console command isn't valid --- .../Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index 1e18095..79bd39e 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs @@ -124,7 +124,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver scene.AddCommand( this, "save iar", - "save iar [--p|-profile=] []", + "save iar [--p|-profile=] []", "Save user inventory archive (IAR).", " is the user's first name." + Environment.NewLine + " is the user's last name." + Environment.NewLine @@ -358,7 +358,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver if (mainParams.Count < 6) { m_log.Error( - "[INVENTORY ARCHIVER]: usage is load iar [--merge] []"); + "[INVENTORY ARCHIVER]: usage is load iar [--merge] []"); return; } @@ -404,7 +404,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver if (mainParams.Count < 6) { m_log.Error( - "[INVENTORY ARCHIVER]: usage is save iar []"); + "[INVENTORY ARCHIVER]: usage is save iar [--p|-profile=] []"); return; } -- cgit v1.1 From 223264047e22b235386cac3517a0b3c6b7133851 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Sat, 18 Dec 2010 00:59:37 +0000 Subject: uncomment "load iar" help lines which added the --merge option --- .../Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index 79bd39e..b1c2a3c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs @@ -109,12 +109,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver scene.AddCommand( this, "load iar", - "load iar []", - //"load iar [--merge] []", + "load iar [--merge] []", "Load user inventory archive (IAR).", - //"--merge is an option which merges the loaded IAR with existing inventory folders where possible, rather than always creating new ones" - //+ " is user's first name." + Environment.NewLine - " is user's first name." + Environment.NewLine + "--merge is an option which merges the loaded IAR with existing inventory folders where possible, rather than always creating new ones" + + " is user's first name." + Environment.NewLine + " is user's last name." + Environment.NewLine + " is the path inside the user's inventory where the IAR should be loaded." + Environment.NewLine + " is the user's password." + Environment.NewLine -- cgit v1.1 From 2a40c8511a972768378452a42aea7a781c30509c Mon Sep 17 00:00:00 2001 From: Marck Date: Sun, 19 Dec 2010 22:59:32 +0100 Subject: Make long help text for new link-region command syntax more explicit. --- OpenSim/Services/GridService/HypergridLinker.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim') diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 643d0fc..549c715 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs @@ -144,7 +144,7 @@ namespace OpenSim.Services.GridService if (MainConsole.Instance != null) { MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", - "link-region []", + "link-region http://:/ []", "Link a HyperGrid Region", RunCommand); MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", "link-region []", -- cgit v1.1 From 3b4af8a0dc30e65b6f5c12d9f312f83be7ed240d Mon Sep 17 00:00:00 2001 From: Marck Date: Mon, 20 Dec 2010 01:36:39 +0100 Subject: Fix osTeleportAgent and osTeleportOwner for the case that GridService is used with a storage provider other than NullRegionData. --- .../ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 5a796b8..bca08fb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -698,21 +698,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api == World.LandChannel.GetLandObject( presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) { - // Check for hostname , attempt to make a hglink + // Check for hostname, attempt to make a HG link, // and convert the regionName to the target region if (regionName.Contains(".") && regionName.Contains(":")) { List regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1); - // Try to link the region - if (regions != null && regions.Count > 0) - { - GridRegion regInfo = regions[0]; - string[] parts = regInfo.RegionName.Split(new char[] { ':' }); - if (parts.Length > 2) - regionName = parts[2]; - else - regionName = parts[0]; - } + string[] parts = regionName.Split(new char[] { ':' }); + if (parts.Length > 2) + regionName = parts[0] + ':' + parts[1] + "/ " + parts[2]; + regionName = "http://" + regionName; } World.RequestTeleportLocation(presence.ControllingClient, regionName, new Vector3((float)position.x, (float)position.y, (float)position.z), -- cgit v1.1 From 711283d3ca8534d650c1ee8ed25984e75e7c6052 Mon Sep 17 00:00:00 2001 From: Marck Date: Mon, 20 Dec 2010 02:50:19 +0100 Subject: More changes to the long help text for console command link-region. --- OpenSim/Services/GridService/HypergridLinker.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 549c715..c02c813 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs @@ -143,9 +143,9 @@ namespace OpenSim.Services.GridService if (MainConsole.Instance != null) { - MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", - "link-region http://:/ []", - "Link a HyperGrid Region", RunCommand); + MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", + "link-region []", + "Link a HyperGrid Region. Examples for : http://grid.net:8002/ or http://example.org/path/foo.php", RunCommand); MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", "link-region []", "Link a hypergrid region (deprecated)", RunCommand); -- cgit v1.1 From c082254b9d819a055338a3d35862f3c296fe1c94 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 19 Dec 2010 19:29:07 -0800 Subject: Put the coarse location updates back to 50 frames, otherwise the dots on the mini-map come and go noticeably. Also increased the Velocity a bit; I had decreased it to 0.885; now it's 0.9. --- OpenSim/Region/Framework/Scenes/Scene.cs | 2 +- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 5517dc3..c4bd028 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -150,7 +150,7 @@ namespace OpenSim.Region.Framework.Scenes private int m_update_backup = 200; private int m_update_terrain = 50; // private int m_update_land = 1; - private int m_update_coarse_locations = 80; + private int m_update_coarse_locations = 50; private int frameMS; private int physicsMS2; diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 9d72bf6..46234f9 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -3206,10 +3206,10 @@ namespace OpenSim.Region.Framework.Scenes m_updateflag = true; - // The magic constant 0.855f seems to make walking feel less jerky, + // The magic constant 0.95f seems to make walking feel less jerky, // probably because it hackishly accounts for the overall latency of // these Velocity updates -- Diva - Velocity = force * .855F; + Velocity = force * .95F; m_forceToApply = null; } -- cgit v1.1