aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2010-03-03 11:03:56 -0800
committerJohn Hurliman2010-03-03 11:03:56 -0800
commit94a3e60bd0b288e744f66347eafdaac70713a759 (patch)
treeb89e4144876f6990459733af0345a8cce6453f07
parent* Fixed bad start position clamping in MakeRootAgent() (diff)
parentActually make EventManager.OnAttach() fire when an object is attached. Previ... (diff)
downloadopensim-SC_OLD-94a3e60bd0b288e744f66347eafdaac70713a759.zip
opensim-SC_OLD-94a3e60bd0b288e744f66347eafdaac70713a759.tar.gz
opensim-SC_OLD-94a3e60bd0b288e744f66347eafdaac70713a759.tar.bz2
opensim-SC_OLD-94a3e60bd0b288e744f66347eafdaac70713a759.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--.nant/local.include22
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs16
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs2
-rw-r--r--OpenSim/Services/Base/ServiceBase.cs20
-rw-r--r--OpenSim/Services/Friends/FriendsServiceBase.cs9
-rw-r--r--prebuild.xml44
7 files changed, 41 insertions, 75 deletions
diff --git a/.nant/local.include b/.nant/local.include
index 5e02665..c611bd2 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -43,11 +43,6 @@
43 </exec> 43 </exec>
44 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> 44 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" />
45 45
46 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.framework.communications.tests">
47 <arg value="./bin/OpenSim.Framework.Communications.Tests.dll" />
48 </exec>
49 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.communications.tests)==0}" />
50
51 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.framework.servers.tests"> 46 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.framework.servers.tests">
52 <arg value="./bin/OpenSim.Framework.Servers.Tests.dll" /> 47 <arg value="./bin/OpenSim.Framework.Servers.Tests.dll" />
53 </exec> 48 </exec>
@@ -106,17 +101,6 @@
106 <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Servers.cov" /> 101 <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Servers.cov" />
107 </exec> 102 </exec>
108 103
109 <exec program="mono">
110 <arg value="--debug" />
111 <arg value="--profile=monocov:outfile=./cov/OpenSim.Framework.Communications.cov,+[OpenSim.Framework.Communications]" />
112 <arg value="/usr/lib/nunit/nunit-console.exe" />
113 <arg value="./bin/OpenSim.Framework.Communications.Tests.dll" />
114 </exec>
115 <delete dir="./cov/OpenSim.Framework.Communications" />
116 <exec program="monocov">
117 <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Communications.cov" />
118 </exec>
119
120<!-- 104<!--
121 <exec program="mono"> 105 <exec program="mono">
122 <arg value="&#45;&#45;debug" /> 106 <arg value="&#45;&#45;debug" />
@@ -227,11 +211,6 @@
227 <arg value="-xml=test-results/OpenSim.Framework.Tests.dll-Results.xml" /> 211 <arg value="-xml=test-results/OpenSim.Framework.Tests.dll-Results.xml" />
228 </exec> 212 </exec>
229 213
230 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.communications.tests">
231 <arg value="./bin/OpenSim.Framework.Communications.Tests.dll" />
232 <arg value="-xml=test-results/OpenSim.Framework.Communications.Tests.dll-Results.xml" />
233 </exec>
234
235 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.serialization.tests"> 214 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.serialization.tests">
236 <arg value="./bin/OpenSim.Framework.Serialization.Tests.dll" /> 215 <arg value="./bin/OpenSim.Framework.Serialization.Tests.dll" />
237 <arg value="-xml=test-results/OpenSim.Framework.Serialization.Tests.dll-Results.xml" /> 216 <arg value="-xml=test-results/OpenSim.Framework.Serialization.Tests.dll-Results.xml" />
@@ -301,7 +280,6 @@
301<!-- <test> --> 280<!-- <test> -->
302<!-- <assemblies> --> 281<!-- <assemblies> -->
303<!-- <include name="./bin/OpenSim.Framework.Tests.dll" /> --> 282<!-- <include name="./bin/OpenSim.Framework.Tests.dll" /> -->
304<!-- <include name="./bin/OpenSim.Framework.Communications.Tests.dll"/> -->
305<!-- <include name="./bin/OpenSim.Framework.Servers.Tests.dll" /> --> 283<!-- <include name="./bin/OpenSim.Framework.Servers.Tests.dll" /> -->
306<!-- <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> --> 284<!-- <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> -->
307<!-- <include name="./bin/OpenSim.Region.ScriptEngine.Tests.dll" /> --> 285<!-- <include name="./bin/OpenSim.Region.ScriptEngine.Tests.dll" /> -->
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index ef49205..569dc8d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -97,6 +97,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
97 /// </summary> 97 /// </summary>
98 public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientIPEndpoint, IStatsCollector 98 public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientIPEndpoint, IStatsCollector
99 { 99 {
100 /// <value>
101 /// Debug packet level. At the moment, only 255 does anything (prints out all in and out packets).
102 /// </value>
103 protected int m_debugPacketLevel = 0;
104
100 #region Events 105 #region Events
101 106
102 public event GenericMessage OnGenericMessage; 107 public event GenericMessage OnGenericMessage;
@@ -472,6 +477,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
472 477
473 public void SetDebugPacketLevel(int newDebug) 478 public void SetDebugPacketLevel(int newDebug)
474 { 479 {
480 m_debugPacketLevel = newDebug;
475 } 481 }
476 482
477 #region Client Methods 483 #region Client Methods
@@ -10952,7 +10958,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10952 LLUDPServer.LogPacketHeader(false, m_circuitCode, 0, packet.Type, (ushort)packet.Length); 10958 LLUDPServer.LogPacketHeader(false, m_circuitCode, 0, packet.Type, (ushort)packet.Length);
10953 #endregion BinaryStats 10959 #endregion BinaryStats
10954 10960
10955 m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, true); 10961 OutPacket(packet, throttlePacketType, true);
10956 } 10962 }
10957 10963
10958 /// <summary> 10964 /// <summary>
@@ -10965,6 +10971,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10965 /// handles splitting manually</param> 10971 /// handles splitting manually</param>
10966 protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting) 10972 protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting)
10967 { 10973 {
10974 if (m_debugPacketLevel >= 255)
10975 m_log.DebugFormat("[CLIENT]: Packet OUT {0}", packet.Type);
10976
10968 m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting); 10977 m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting);
10969 } 10978 }
10970 10979
@@ -11036,10 +11045,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11036 /// <param name="Pack">OpenMetaverse.packet</param> 11045 /// <param name="Pack">OpenMetaverse.packet</param>
11037 public void ProcessInPacket(Packet Pack) 11046 public void ProcessInPacket(Packet Pack)
11038 { 11047 {
11039// m_log.DebugFormat("[CLIENT]: Packet IN {0}", Pack); 11048 if (m_debugPacketLevel >= 255)
11049 m_log.DebugFormat("[CLIENT]: Packet IN {0}", Pack.Type);
11040 11050
11041 if (!ProcessPacketMethod(Pack)) 11051 if (!ProcessPacketMethod(Pack))
11042 m_log.Warn("[CLIENT]: unhandled packet " + Pack); 11052 m_log.Warn("[CLIENT]: unhandled packet " + Pack.Type);
11043 11053
11044 PacketPool.Instance.ReturnPacket(Pack); 11054 PacketPool.Instance.ReturnPacket(Pack);
11045 } 11055 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 369552f..b7fcd7d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -540,6 +540,9 @@ namespace OpenSim.Region.Framework.Scenes
540 // Fire after attach, so we don't get messy perms dialogs 540 // Fire after attach, so we don't get messy perms dialogs
541 // 3 == AttachedRez 541 // 3 == AttachedRez
542 objatt.CreateScriptInstances(0, true, m_parentScene.DefaultScriptEngine, 3); 542 objatt.CreateScriptInstances(0, true, m_parentScene.DefaultScriptEngine, 3);
543
544 // Do this last so that event listeners have access to all the effects of the attachment
545 m_parentScene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, remoteClient.AgentId);
543 } 546 }
544 return objatt; 547 return objatt;
545 } 548 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 6395d98..680c39a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -422,7 +422,7 @@ namespace OpenSim.Region.Framework.Scenes
422 422
423 if (!scenePresence.IsChildAgent) 423 if (!scenePresence.IsChildAgent)
424 { 424 {
425 m_log.ErrorFormat("Packet debug for {0} {1} set to {2}", 425 m_log.DebugFormat("Packet debug for {0} {1} set to {2}",
426 scenePresence.Firstname, 426 scenePresence.Firstname,
427 scenePresence.Lastname, 427 scenePresence.Lastname,
428 newDebug); 428 newDebug);
diff --git a/OpenSim/Services/Base/ServiceBase.cs b/OpenSim/Services/Base/ServiceBase.cs
index 8e24d85..91d5c56 100644
--- a/OpenSim/Services/Base/ServiceBase.cs
+++ b/OpenSim/Services/Base/ServiceBase.cs
@@ -26,7 +26,9 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
29using System.Reflection; 30using System.Reflection;
31using log4net;
30using Nini.Config; 32using Nini.Config;
31using OpenSim.Services.Interfaces; 33using OpenSim.Services.Interfaces;
32 34
@@ -34,6 +36,8 @@ namespace OpenSim.Services.Base
34{ 36{
35 public class ServiceBase 37 public class ServiceBase
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40
37 public T LoadPlugin<T>(string dllName) where T:class 41 public T LoadPlugin<T>(string dllName) where T:class
38 { 42 {
39 return LoadPlugin<T>(dllName, new Object[0]); 43 return LoadPlugin<T>(dllName, new Object[0]);
@@ -61,8 +65,12 @@ namespace OpenSim.Services.Base
61 { 65 {
62 Assembly pluginAssembly = Assembly.LoadFrom(dllName); 66 Assembly pluginAssembly = Assembly.LoadFrom(dllName);
63 67
68// m_log.DebugFormat("[SERVICE BASE]: Found assembly {0}", dllName);
69
64 foreach (Type pluginType in pluginAssembly.GetTypes()) 70 foreach (Type pluginType in pluginAssembly.GetTypes())
65 { 71 {
72// m_log.DebugFormat("[SERVICE BASE]: Found type {0}", pluginType);
73
66 if (pluginType.IsPublic) 74 if (pluginType.IsPublic)
67 { 75 {
68 if (className != String.Empty && 76 if (className != String.Empty &&
@@ -86,7 +94,15 @@ namespace OpenSim.Services.Base
86 } 94 }
87 catch (Exception e) 95 catch (Exception e)
88 { 96 {
89 Console.WriteLine("XXX Exception " + e.StackTrace); 97 List<string> strArgs = new List<string>();
98 foreach (Object arg in args)
99 strArgs.Add(arg.ToString());
100
101 m_log.Error(
102 string.Format(
103 "[SERVICE BASE]: Failed to load plugin {0} from {1} with args {2}",
104 interfaceName, dllName, string.Join(", ", strArgs.ToArray())), e);
105
90 return null; 106 return null;
91 } 107 }
92 } 108 }
@@ -95,4 +111,4 @@ namespace OpenSim.Services.Base
95 { 111 {
96 } 112 }
97 } 113 }
98} 114} \ No newline at end of file
diff --git a/OpenSim/Services/Friends/FriendsServiceBase.cs b/OpenSim/Services/Friends/FriendsServiceBase.cs
index 9858972..6ab0bff 100644
--- a/OpenSim/Services/Friends/FriendsServiceBase.cs
+++ b/OpenSim/Services/Friends/FriendsServiceBase.cs
@@ -27,13 +27,12 @@
27 27
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using log4net;
30using Nini.Config; 31using Nini.Config;
31using OpenSim.Framework; 32using OpenSim.Framework;
32using OpenSim.Data; 33using OpenSim.Data;
33using OpenSim.Services.Interfaces; 34using OpenSim.Services.Interfaces;
34using OpenSim.Services.Base; 35using OpenSim.Services.Base;
35using Nini.Config;
36using log4net;
37 36
38namespace OpenSim.Services.Friends 37namespace OpenSim.Services.Friends
39{ 38{
@@ -80,7 +79,11 @@ namespace OpenSim.Services.Friends
80 79
81 m_Database = LoadPlugin<IFriendsData>(dllName, new Object[] { connString, realm }); 80 m_Database = LoadPlugin<IFriendsData>(dllName, new Object[] { connString, realm });
82 if (m_Database == null) 81 if (m_Database == null)
83 throw new Exception("Could not find a storage interface in the given module"); 82 {
83 throw new Exception(
84 string.Format(
85 "Could not find a storage interface {0} in the given StorageProvider {1}", "IFriendsData", dllName));
86 }
84 } 87 }
85 } 88 }
86} 89}
diff --git a/prebuild.xml b/prebuild.xml
index e19e636..09d78e9 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1539,42 +1539,6 @@
1539 </Files> 1539 </Files>
1540 </Project> 1540 </Project>
1541 1541
1542 <Project frameworkVersion="v3_5" name="OpenSim.Region.Communications.Hypergrid" path="OpenSim/Region/Communications/Hypergrid" type="Library">
1543 <Configuration name="Debug">
1544 <Options>
1545 <OutputPath>../../../../bin/</OutputPath>
1546 </Options>
1547 </Configuration>
1548 <Configuration name="Release">
1549 <Options>
1550 <OutputPath>../../../../bin/</OutputPath>
1551 </Options>
1552 </Configuration>
1553
1554 <ReferencePath>../../../../bin/</ReferencePath>
1555 <Reference name="System"/>
1556 <Reference name="System.Drawing"/>
1557 <Reference name="System.Xml"/>
1558 <Reference name="OpenSim.Data"/>
1559 <Reference name="OpenSim.Framework"/>
1560 <Reference name="OpenSim.Framework.Communications" />
1561 <Reference name="OpenSim.Framework.Servers"/>
1562 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1563 <Reference name="OpenSim.Framework.Statistics"/>
1564 <Reference name="OpenSim.Region.Communications.Local"/>
1565 <Reference name="OpenSim.Region.Communications.OGS1"/>
1566 <Reference name="OpenSim.Region.Framework"/>
1567 <Reference name="OpenSim.Services.Interfaces"/>
1568 <Reference name="OpenMetaverse.dll"/>
1569 <Reference name="OpenMetaverseTypes.dll"/>
1570 <Reference name="XMLRPC.dll"/>
1571 <Reference name="log4net.dll"/>
1572
1573 <Files>
1574 <Match pattern="*.cs" recurse="true"/>
1575 </Files>
1576 </Project>
1577
1578 <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library"> 1542 <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library">
1579 <Configuration name="Debug"> 1543 <Configuration name="Debug">
1580 <Options> 1544 <Options>
@@ -1599,7 +1563,6 @@
1599 <Reference name="OpenSim.Framework.Console"/> 1563 <Reference name="OpenSim.Framework.Console"/>
1600 <Reference name="OpenSim.Framework.Communications"/> 1564 <Reference name="OpenSim.Framework.Communications"/>
1601 <Reference name="OpenSim.Framework.Statistics"/> 1565 <Reference name="OpenSim.Framework.Statistics"/>
1602 <Reference name="OpenSim.Region.Communications.Local"/>
1603 <Reference name="OpenSim.Region.Physics.Manager"/> 1566 <Reference name="OpenSim.Region.Physics.Manager"/>
1604 <Reference name="OpenSim.Region.CoreModules"/> 1567 <Reference name="OpenSim.Region.CoreModules"/>
1605 <Reference name="XMLRPC.dll"/> 1568 <Reference name="XMLRPC.dll"/>
@@ -1639,7 +1602,6 @@
1639 <Reference name="OpenSim.Framework.Communications"/> 1602 <Reference name="OpenSim.Framework.Communications"/>
1640 <Reference name="OpenSim.Framework.Statistics"/> 1603 <Reference name="OpenSim.Framework.Statistics"/>
1641 <Reference name="OpenSim.Region.ClientStack"/> 1604 <Reference name="OpenSim.Region.ClientStack"/>
1642 <Reference name="OpenSim.Region.Communications.Local"/>
1643 <Reference name="OpenSim.Region.Physics.Manager"/> 1605 <Reference name="OpenSim.Region.Physics.Manager"/>
1644 <Reference name="OpenSim.Services.Interfaces"/> 1606 <Reference name="OpenSim.Services.Interfaces"/>
1645 <Reference name="BclExtras.dll"/> 1607 <Reference name="BclExtras.dll"/>
@@ -1713,10 +1675,7 @@
1713 <Reference name="OpenSim.Region.CoreModules"/> 1675 <Reference name="OpenSim.Region.CoreModules"/>
1714 <Reference name="OpenSim.Region.ClientStack"/> 1676 <Reference name="OpenSim.Region.ClientStack"/>
1715 <Reference name="OpenSim.Framework.Communications"/> 1677 <Reference name="OpenSim.Framework.Communications"/>
1716 <Reference name="OpenSim.Region.Communications.OGS1"/>
1717 <Reference name="XMLRPC.dll"/> 1678 <Reference name="XMLRPC.dll"/>
1718 <Reference name="OpenSim.Region.Communications.Local"/>
1719 <Reference name="OpenSim.Region.Communications.Hypergrid"/>
1720 <Reference name="Nini.dll" /> 1679 <Reference name="Nini.dll" />
1721 <Reference name="log4net.dll"/> 1680 <Reference name="log4net.dll"/>
1722 1681
@@ -2785,7 +2744,6 @@
2785 <Reference name="OpenSim.Data"/> 2744 <Reference name="OpenSim.Data"/>
2786 <Reference name="OpenSim.Services.Interfaces"/> 2745 <Reference name="OpenSim.Services.Interfaces"/>
2787 <Reference name="OpenSim.Server.Base"/> 2746 <Reference name="OpenSim.Server.Base"/>
2788 <Reference name="OpenSim.Region.Communications.Local"/>
2789 <Reference name="OpenSim.Region.Framework"/> 2747 <Reference name="OpenSim.Region.Framework"/>
2790 <Reference name="OpenSim.Region.CoreModules"/> 2748 <Reference name="OpenSim.Region.CoreModules"/>
2791 <Reference name="OpenSim.Region.Physics.Manager"/> 2749 <Reference name="OpenSim.Region.Physics.Manager"/>
@@ -3019,7 +2977,6 @@
3019 <Reference name="OpenSim.Framework.Servers"/> 2977 <Reference name="OpenSim.Framework.Servers"/>
3020 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 2978 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
3021 <Reference name="OpenSim.Framework.Statistics"/> 2979 <Reference name="OpenSim.Framework.Statistics"/>
3022 <Reference name="OpenSim.Region.Communications.Local"/>
3023 <Reference name="OpenSim.Region.Framework"/> 2980 <Reference name="OpenSim.Region.Framework"/>
3024 <Reference name="OpenSim.Region.CoreModules"/> 2981 <Reference name="OpenSim.Region.CoreModules"/>
3025 <Reference name="OpenSim.Region.Physics.Manager"/> 2982 <Reference name="OpenSim.Region.Physics.Manager"/>
@@ -3083,7 +3040,6 @@
3083 <Reference name="OpenSim.Framework.Servers"/> 3040 <Reference name="OpenSim.Framework.Servers"/>
3084 <Reference name="OpenSim.Framework.Statistics"/> 3041 <Reference name="OpenSim.Framework.Statistics"/>
3085 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 3042 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
3086 <Reference name="OpenSim.Region.Communications.Local"/>
3087 <Reference name="OpenSim.Region.Framework"/> 3043 <Reference name="OpenSim.Region.Framework"/>
3088 <Reference name="OpenSim.Region.CoreModules"/> 3044 <Reference name="OpenSim.Region.CoreModules"/>
3089 <Reference name="OpenSim.Region.Physics.Manager"/> 3045 <Reference name="OpenSim.Region.Physics.Manager"/>