aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2010-12-20 02:49:31 +0000
committerMelanie2010-12-20 02:49:31 +0000
commit11eabf0e51c213a07cf9cc2048ae67b68ea573ef (patch)
treebd046ac4dbfd93ae8801d29318a58b3b52432330 /OpenSim/Region
parentfix 'system.exception: unknown type in list.size: system.uint32' (diff)
parentPut the coarse location updates back to 50 frames, otherwise the dots on the ... (diff)
downloadopensim-SC_OLD-11eabf0e51c213a07cf9cc2048ae67b68ea573ef.zip
opensim-SC_OLD-11eabf0e51c213a07cf9cc2048ae67b68ea573ef.tar.gz
opensim-SC_OLD-11eabf0e51c213a07cf9cc2048ae67b68ea573ef.tar.bz2
opensim-SC_OLD-11eabf0e51c213a07cf9cc2048ae67b68ea573ef.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs14
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs16
5 files changed, 13 insertions, 22 deletions
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
54 /// The maximum major version of archive that we can read. Minor versions shouldn't need a max number since version 54 /// The maximum major version of archive that we can read. Minor versions shouldn't need a max number since version
55 /// bumps here should be compatible. 55 /// bumps here should be compatible.
56 /// </summary> 56 /// </summary>
57 public static int MAX_MAJOR_VERSION = 0; 57 public static int MAX_MAJOR_VERSION = 1;
58 58
59 protected TarArchiveReader archive; 59 protected TarArchiveReader archive;
60 60
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 1e18095..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
109 109
110 scene.AddCommand( 110 scene.AddCommand(
111 this, "load iar", 111 this, "load iar",
112 "load iar <first> <last> <inventory path> <password> [<IAR path>]", 112 "load iar [--merge] <first> <last> <inventory path> <password> [<IAR path>]",
113 //"load iar [--merge] <first> <last> <inventory path> <password> [<IAR path>]",
114 "Load user inventory archive (IAR).", 113 "Load user inventory archive (IAR).",
115 //"--merge is an option which merges the loaded IAR with existing inventory folders where possible, rather than always creating new ones" 114 "--merge is an option which merges the loaded IAR with existing inventory folders where possible, rather than always creating new ones"
116 //+ "<first> is user's first name." + Environment.NewLine 115 + "<first> is user's first name." + Environment.NewLine
117 "<first> is user's first name." + Environment.NewLine
118 + "<last> is user's last name." + Environment.NewLine 116 + "<last> is user's last name." + Environment.NewLine
119 + "<inventory path> is the path inside the user's inventory where the IAR should be loaded." + Environment.NewLine 117 + "<inventory path> is the path inside the user's inventory where the IAR should be loaded." + Environment.NewLine
120 + "<password> is the user's password." + Environment.NewLine 118 + "<password> is the user's password." + Environment.NewLine
@@ -124,7 +122,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
124 122
125 scene.AddCommand( 123 scene.AddCommand(
126 this, "save iar", 124 this, "save iar",
127 "save iar <first> <last> <inventory path> <password> [--p|-profile=<url>] [<IAR path>]", 125 "save iar [--p|-profile=<url>] <first> <last> <inventory path> <password> [<IAR path>]",
128 "Save user inventory archive (IAR).", 126 "Save user inventory archive (IAR).",
129 "<first> is the user's first name." + Environment.NewLine 127 "<first> is the user's first name." + Environment.NewLine
130 + "<last> is the user's last name." + Environment.NewLine 128 + "<last> is the user's last name." + Environment.NewLine
@@ -358,7 +356,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
358 if (mainParams.Count < 6) 356 if (mainParams.Count < 6)
359 { 357 {
360 m_log.Error( 358 m_log.Error(
361 "[INVENTORY ARCHIVER]: usage is load iar [--merge] <first name> <last name> <inventory path> <user password> [<load file path>]"); 359 "[INVENTORY ARCHIVER]: usage is load iar [--merge] <first name> <last name> <inventory path> <user password> [<load file path>]");
362 return; 360 return;
363 } 361 }
364 362
@@ -404,7 +402,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
404 if (mainParams.Count < 6) 402 if (mainParams.Count < 6)
405 { 403 {
406 m_log.Error( 404 m_log.Error(
407 "[INVENTORY ARCHIVER]: usage is save iar <first name> <last name> <inventory path> <user password> [<save file path>]"); 405 "[INVENTORY ARCHIVER]: usage is save iar [--p|-profile=<url>] <first name> <last name> <inventory path> <user password> [<save file path>]");
408 return; 406 return;
409 } 407 }
410 408
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 3776d47..d915807 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Region.Framework.Scenes
152 private int m_update_backup = 200; 152 private int m_update_backup = 200;
153 private int m_update_terrain = 50; 153 private int m_update_terrain = 50;
154// private int m_update_land = 1; 154// private int m_update_land = 1;
155 private int m_update_coarse_locations = 80; 155 private int m_update_coarse_locations = 50;
156 156
157 private int frameMS; 157 private int frameMS;
158 private int physicsMS2; 158 private int physicsMS2;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 254fe37..557fc42 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3595,7 +3595,6 @@ if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity; // add for ju
3595//Console.WriteLine("UM3 {0}", Velocity); 3595//Console.WriteLine("UM3 {0}", Velocity);
3596 Velocity = force; // add for jumping 3596 Velocity = force; // add for jumping
3597 } 3597 }
3598
3599 } 3598 }
3600 // } // end realign 3599 // } // end realign
3601 } // add for jumping 3600 } // add for jumping
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 712648d..3f0393d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -707,21 +707,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
707 == World.LandChannel.GetLandObject( 707 == World.LandChannel.GetLandObject(
708 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) 708 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
709 { 709 {
710 // Check for hostname , attempt to make a hglink 710 // Check for hostname, attempt to make a HG link,
711 // and convert the regionName to the target region 711 // and convert the regionName to the target region
712 if (regionName.Contains(".") && regionName.Contains(":")) 712 if (regionName.Contains(".") && regionName.Contains(":"))
713 { 713 {
714 List<GridRegion> regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1); 714 List<GridRegion> regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1);
715 // Try to link the region 715 string[] parts = regionName.Split(new char[] { ':' });
716 if (regions != null && regions.Count > 0) 716 if (parts.Length > 2)
717 { 717 regionName = parts[0] + ':' + parts[1] + "/ " + parts[2];
718 GridRegion regInfo = regions[0]; 718 regionName = "http://" + regionName;
719 string[] parts = regInfo.RegionName.Split(new char[] { ':' });
720 if (parts.Length > 2)
721 regionName = parts[2];
722 else
723 regionName = parts[0];
724 }
725 } 719 }
726 World.RequestTeleportLocation(presence.ControllingClient, regionName, 720 World.RequestTeleportLocation(presence.ControllingClient, regionName,
727 new Vector3((float)position.x, (float)position.y, (float)position.z), 721 new Vector3((float)position.x, (float)position.y, (float)position.z),