aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2009-10-09 17:23:18 +0100
committerMelanie2009-10-09 17:23:18 +0100
commit527c94825b733fe0aaf0d2a08eb9e5b16d5db6c6 (patch)
tree1ecc6ce479e3041769112fec9805b11245880079 /OpenSim
parentSlow down the packet receiving code again after new reports of thread storms. (diff)
parentMerge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-527c94825b733fe0aaf0d2a08eb9e5b16d5db6c6.zip
opensim-SC_OLD-527c94825b733fe0aaf0d2a08eb9e5b16d5db6c6.tar.gz
opensim-SC_OLD-527c94825b733fe0aaf0d2a08eb9e5b16d5db6c6.tar.bz2
opensim-SC_OLD-527c94825b733fe0aaf0d2a08eb9e5b16d5db6c6.tar.xz
Merge branch 'master' into htb-throttle
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs4
-rw-r--r--OpenSim/Framework/AvatarWearable.cs4
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs20
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs2
4 files changed, 22 insertions, 8 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 3f4214e..56fcc15 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -66,6 +66,8 @@ namespace OpenSim.Framework
66 private static UUID SHIRT_ITEM = new UUID("77c41e39-38f9-f75a-0000-585989bf0000"); 66 private static UUID SHIRT_ITEM = new UUID("77c41e39-38f9-f75a-0000-585989bf0000");
67 private static UUID PANTS_ASSET = new UUID("00000000-38f9-1111-024e-222222111120"); 67 private static UUID PANTS_ASSET = new UUID("00000000-38f9-1111-024e-222222111120");
68 private static UUID PANTS_ITEM = new UUID("77c41e39-38f9-f75a-0000-5859892f1111"); 68 private static UUID PANTS_ITEM = new UUID("77c41e39-38f9-f75a-0000-5859892f1111");
69 private static UUID HAIR_ASSET = new UUID("d342e6c0-b9d2-11dc-95ff-0800200c9a66");
70 private static UUID HAIR_ITEM = new UUID("d342e6c1-b9d2-11dc-95ff-0800200c9a66");
69 71
70 public readonly static int VISUALPARAM_COUNT = 218; 72 public readonly static int VISUALPARAM_COUNT = 218;
71 73
@@ -238,6 +240,8 @@ namespace OpenSim.Framework
238 m_wearables[BODY].ItemID = BODY_ITEM; 240 m_wearables[BODY].ItemID = BODY_ITEM;
239 m_wearables[SKIN].AssetID = SKIN_ASSET; 241 m_wearables[SKIN].AssetID = SKIN_ASSET;
240 m_wearables[SKIN].ItemID = SKIN_ITEM; 242 m_wearables[SKIN].ItemID = SKIN_ITEM;
243 m_wearables[HAIR].AssetID = HAIR_ASSET;
244 m_wearables[HAIR].ItemID = HAIR_ITEM;
241 m_wearables[SHIRT].AssetID = SHIRT_ASSET; 245 m_wearables[SHIRT].AssetID = SHIRT_ASSET;
242 m_wearables[SHIRT].ItemID = SHIRT_ITEM; 246 m_wearables[SHIRT].ItemID = SHIRT_ITEM;
243 m_wearables[PANTS].AssetID = PANTS_ASSET; 247 m_wearables[PANTS].AssetID = PANTS_ASSET;
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index 4a5253c..87d9e61 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.cs
@@ -60,6 +60,10 @@ namespace OpenSim.Framework
60 // Body 60 // Body
61 defaultWearables[0].ItemID = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9"); 61 defaultWearables[0].ItemID = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9");
62 defaultWearables[0].AssetID = new UUID("66c41e39-38f9-f75a-024e-585989bfab73"); 62 defaultWearables[0].AssetID = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");
63
64 // Hair
65 defaultWearables[2].ItemID = new UUID("d342e6c1-b9d2-11dc-95ff-0800200c9a66");
66 defaultWearables[2].AssetID = new UUID("d342e6c0-b9d2-11dc-95ff-0800200c9a66");
63 67
64 // Skin 68 // Skin
65 defaultWearables[1].ItemID = new UUID("77c41e39-38f9-f75a-024e-585989bfabc9"); 69 defaultWearables[1].ItemID = new UUID("77c41e39-38f9-f75a-024e-585989bfabc9");
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 4592c31..3df3a1c 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -459,7 +459,8 @@ namespace OpenSim
459 459
460 scene.DeleteAllSceneObjects(); 460 scene.DeleteAllSceneObjects();
461 m_sceneManager.CloseScene(scene); 461 m_sceneManager.CloseScene(scene);
462 462 ShutdownClientServer(scene.RegionInfo);
463
463 if (!cleanup) 464 if (!cleanup)
464 return; 465 return;
465 466
@@ -519,7 +520,7 @@ namespace OpenSim
519 } 520 }
520 521
521 m_sceneManager.CloseScene(scene); 522 m_sceneManager.CloseScene(scene);
522 523 ShutdownClientServer(scene.RegionInfo);
523 } 524 }
524 525
525 /// <summary> 526 /// <summary>
@@ -653,12 +654,10 @@ namespace OpenSim
653 storageManager, m_moduleLoader, false, m_configSettings.PhysicalPrim, 654 storageManager, m_moduleLoader, false, m_configSettings.PhysicalPrim,
654 m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); 655 m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version);
655 } 656 }
656 657
657 public void handleRestartRegion(RegionInfo whichRegion) 658 protected void ShutdownClientServer(RegionInfo whichRegion)
658 { 659 {
659 m_log.Info("[OPENSIM]: Got restart signal from SceneManager"); 660 // Close and remove the clientserver for a region
660
661 // Shutting down the client server
662 bool foundClientServer = false; 661 bool foundClientServer = false;
663 int clientServerElement = 0; 662 int clientServerElement = 0;
664 Location location = new Location(whichRegion.RegionHandle); 663 Location location = new Location(whichRegion.RegionHandle);
@@ -678,6 +677,13 @@ namespace OpenSim
678 m_clientServers[clientServerElement].NetworkStop(); 677 m_clientServers[clientServerElement].NetworkStop();
679 m_clientServers.RemoveAt(clientServerElement); 678 m_clientServers.RemoveAt(clientServerElement);
680 } 679 }
680 }
681
682 public void handleRestartRegion(RegionInfo whichRegion)
683 {
684 m_log.Info("[OPENSIM]: Got restart signal from SceneManager");
685
686 ShutdownClientServer(whichRegion);
681 IScene scene; 687 IScene scene;
682 CreateRegion(whichRegion, true, out scene); 688 CreateRegion(whichRegion, true, out scene);
683 } 689 }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index e695133..847da8c 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -642,7 +642,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
642 m_ScriptErrorMessage += "Failed to compile script in object: '" + part.ParentGroup.RootPart.Name + "' Script name: '" + item.Name + "' Error message: " + e.Message.ToString(); 642 m_ScriptErrorMessage += "Failed to compile script in object: '" + part.ParentGroup.RootPart.Name + "' Script name: '" + item.Name + "' Error message: " + e.Message.ToString();
643 643
644 m_ScriptFailCount++; 644 m_ScriptFailCount++;
645 string text = "Error compiling script:\n" + e.Message.ToString(); 645 string text = "Error compiling script '" + item.Name + "':\n" + e.Message.ToString();
646 if (text.Length > 1000) 646 if (text.Length > 1000)
647 text = text.Substring(0, 1000); 647 text = text.Substring(0, 1000);
648 World.SimChat(Utils.StringToBytes(text), 648 World.SimChat(Utils.StringToBytes(text),