aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/ClientStackManager.cs32
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs2
2 files changed, 22 insertions, 12 deletions
diff --git a/OpenSim/Region/ClientStack/ClientStackManager.cs b/OpenSim/Region/ClientStack/ClientStackManager.cs
index 5723739..098466d 100644
--- a/OpenSim/Region/ClientStack/ClientStackManager.cs
+++ b/OpenSim/Region/ClientStack/ClientStackManager.cs
@@ -48,22 +48,32 @@ namespace OpenSim.Region.Environment
48 { 48 {
49 m_log.Info("[CLIENTSTACK]: Attempting to load " + dllName); 49 m_log.Info("[CLIENTSTACK]: Attempting to load " + dllName);
50 50
51 plugin = null; 51 try
52 pluginAssembly = Assembly.LoadFrom(dllName);
53
54 foreach (Type pluginType in pluginAssembly.GetTypes())
55 { 52 {
56 if (pluginType.IsPublic) 53 plugin = null;
57 { 54 pluginAssembly = Assembly.LoadFrom(dllName);
58 Type typeInterface = pluginType.GetInterface("IClientNetworkServer", true);
59 55
60 if (typeInterface != null) 56 foreach (Type pluginType in pluginAssembly.GetTypes())
57 {
58 if (pluginType.IsPublic)
61 { 59 {
62 m_log.Info("[CLIENTSTACK]: Added IClientNetworkServer Interface"); 60 Type typeInterface = pluginType.GetInterface("IClientNetworkServer", true);
63 plugin = pluginType; 61
64 return; 62 if (typeInterface != null)
63 {
64 m_log.Info("[CLIENTSTACK]: Added IClientNetworkServer Interface");
65 plugin = pluginType;
66 return;
67 }
65 } 68 }
66 } 69 }
70 } catch (ReflectionTypeLoadException e)
71 {
72 foreach(Exception e2 in e.LoaderExceptions)
73 {
74 m_log.Error(e2.ToString());
75 }
76 throw e;
67 } 77 }
68 } 78 }
69 79
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index c953228..6ad4c2d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -664,7 +664,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
664 m_log.DebugFormat( 664 m_log.DebugFormat(
665 "[CLIENT]: Entered main packet processing loop for {0} {1}", FirstName, LastName); 665 "[CLIENT]: Entered main packet processing loop for {0} {1}", FirstName, LastName);
666 666
667 while (true) 667 while (IsActive)
668 { 668 {
669 LLQueItem nextPacket = m_PacketHandler.PacketQueue.Dequeue(); 669 LLQueItem nextPacket = m_PacketHandler.PacketQueue.Dequeue();
670 670