From bec4d0c564a0ed421a021d1446f2851a07517381 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 9 Oct 2009 16:54:50 +0100
Subject: fix test suite (and hopefully the panda build) by commenting out
LindenUDP.Tests.dll references
---
.nant/local.include | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/.nant/local.include b/.nant/local.include
index f78c6a6..266864b 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -58,10 +58,12 @@
+
@@ -115,16 +117,18 @@
+
@@ -238,10 +242,12 @@
+
--
cgit v1.1
From 1c220e173c37d835542983898dc01b004112b4a9 Mon Sep 17 00:00:00 2001
From: Rob Smart
Date: Fri, 9 Oct 2009 16:13:55 +0100
Subject: Adding a hair item to the default wearables, fixes newly created
avatars appearing as a cloud
---
OpenSim/Framework/AvatarAppearance.cs | 4 ++++
OpenSim/Framework/AvatarWearable.cs | 4 ++++
2 files changed, 8 insertions(+)
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
private static UUID SHIRT_ITEM = new UUID("77c41e39-38f9-f75a-0000-585989bf0000");
private static UUID PANTS_ASSET = new UUID("00000000-38f9-1111-024e-222222111120");
private static UUID PANTS_ITEM = new UUID("77c41e39-38f9-f75a-0000-5859892f1111");
+ private static UUID HAIR_ASSET = new UUID("d342e6c0-b9d2-11dc-95ff-0800200c9a66");
+ private static UUID HAIR_ITEM = new UUID("d342e6c1-b9d2-11dc-95ff-0800200c9a66");
public readonly static int VISUALPARAM_COUNT = 218;
@@ -238,6 +240,8 @@ namespace OpenSim.Framework
m_wearables[BODY].ItemID = BODY_ITEM;
m_wearables[SKIN].AssetID = SKIN_ASSET;
m_wearables[SKIN].ItemID = SKIN_ITEM;
+ m_wearables[HAIR].AssetID = HAIR_ASSET;
+ m_wearables[HAIR].ItemID = HAIR_ITEM;
m_wearables[SHIRT].AssetID = SHIRT_ASSET;
m_wearables[SHIRT].ItemID = SHIRT_ITEM;
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
// Body
defaultWearables[0].ItemID = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9");
defaultWearables[0].AssetID = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");
+
+ // Hair
+ defaultWearables[2].ItemID = new UUID("d342e6c1-b9d2-11dc-95ff-0800200c9a66");
+ defaultWearables[2].AssetID = new UUID("d342e6c0-b9d2-11dc-95ff-0800200c9a66");
// Skin
defaultWearables[1].ItemID = new UUID("77c41e39-38f9-f75a-024e-585989bfabc9");
--
cgit v1.1
From b6678faf3499c85cbe4e1655acc907e29c30eb59 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 9 Oct 2009 17:28:16 +0100
Subject: * Apply http://opensimulator.org/mantis/view.php?id=3933 * Remove
client servers when regions are closed or removed * Thanks randomhuman!
---
OpenSim/Region/Application/OpenSimBase.cs | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
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
scene.DeleteAllSceneObjects();
m_sceneManager.CloseScene(scene);
-
+ ShutdownClientServer(scene.RegionInfo);
+
if (!cleanup)
return;
@@ -519,7 +520,7 @@ namespace OpenSim
}
m_sceneManager.CloseScene(scene);
-
+ ShutdownClientServer(scene.RegionInfo);
}
///
@@ -653,12 +654,10 @@ namespace OpenSim
storageManager, m_moduleLoader, false, m_configSettings.PhysicalPrim,
m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version);
}
-
- public void handleRestartRegion(RegionInfo whichRegion)
+
+ protected void ShutdownClientServer(RegionInfo whichRegion)
{
- m_log.Info("[OPENSIM]: Got restart signal from SceneManager");
-
- // Shutting down the client server
+ // Close and remove the clientserver for a region
bool foundClientServer = false;
int clientServerElement = 0;
Location location = new Location(whichRegion.RegionHandle);
@@ -678,6 +677,13 @@ namespace OpenSim
m_clientServers[clientServerElement].NetworkStop();
m_clientServers.RemoveAt(clientServerElement);
}
+ }
+
+ public void handleRestartRegion(RegionInfo whichRegion)
+ {
+ m_log.Info("[OPENSIM]: Got restart signal from SceneManager");
+
+ ShutdownClientServer(whichRegion);
IScene scene;
CreateRegion(whichRegion, true, out scene);
}
--
cgit v1.1
From f1f239758f10ee4dfa1360a5fc0aa98d025f9035 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 9 Oct 2009 17:43:25 +0100
Subject: Apply http://opensimulator.org/mantis/view.php?id=4066 If XEngine
compile fails, show script name in error message in-world as well as the
exception itself Thanks Luca Peck
---
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
m_ScriptErrorMessage += "Failed to compile script in object: '" + part.ParentGroup.RootPart.Name + "' Script name: '" + item.Name + "' Error message: " + e.Message.ToString();
m_ScriptFailCount++;
- string text = "Error compiling script:\n" + e.Message.ToString();
+ string text = "Error compiling script '" + item.Name + "':\n" + e.Message.ToString();
if (text.Length > 1000)
text = text.Substring(0, 1000);
World.SimChat(Utils.StringToBytes(text),
--
cgit v1.1
From 16a9a2604bbb258de9b2c3589d1551a357704204 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 9 Oct 2009 18:19:51 +0100
Subject: Remove another lindenudp tests reference. Maybe this will make panda
happy
---
.nant/local.include | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.nant/local.include b/.nant/local.include
index 266864b..5e02665 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -277,7 +277,7 @@
-
+
--
cgit v1.1