aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Base
diff options
context:
space:
mode:
authorlbsa712009-05-27 11:54:17 +0000
committerlbsa712009-05-27 11:54:17 +0000
commit892406248ab6452871fa8ac74c8c8b856feee070 (patch)
tree9a7345d58d1027e9194fede31bb50ad91a0cd655 /OpenSim/Server/Base
parentCatching weirdnesses on resolving External EndPoint in agent transfers. Will ... (diff)
downloadopensim-SC-892406248ab6452871fa8ac74c8c8b856feee070.zip
opensim-SC-892406248ab6452871fa8ac74c8c8b856feee070.tar.gz
opensim-SC-892406248ab6452871fa8ac74c8c8b856feee070.tar.bz2
opensim-SC-892406248ab6452871fa8ac74c8c8b856feee070.tar.xz
* Added OpenSim.Server.Handlers.Tests project
* Added AssetServerGetHandlerTests - not really wired up yet; more to come. * Ignored some gens
Diffstat (limited to 'OpenSim/Server/Base')
-rw-r--r--OpenSim/Server/Base/ServerUtils.cs8
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index d827b86..c0749e3 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -32,6 +32,7 @@ using System.Xml;
32using System.Xml.Serialization; 32using System.Xml.Serialization;
33using System.Text; 33using System.Text;
34using log4net; 34using log4net;
35using OpenSim.Framework;
35 36
36namespace OpenSim.Server.Base 37namespace OpenSim.Server.Base
37{ 38{
@@ -92,7 +93,7 @@ namespace OpenSim.Server.Base
92 93
93 ms.Seek(0, SeekOrigin.Begin); 94 ms.Seek(0, SeekOrigin.Begin);
94 byte[] ret = ms.GetBuffer(); 95 byte[] ret = ms.GetBuffer();
95 Array.Resize<byte>(ref ret, (int)ms.Length); 96 Array.Resize(ref ret, (int)ms.Length);
96 97
97 return ret; 98 return ret;
98 } 99 }
@@ -117,9 +118,6 @@ namespace OpenSim.Server.Base
117 118
118 try 119 try
119 { 120 {
120 //m_log.DebugFormat("[PLUGINS]: Loading plugins from {0}", System.IO.Directory.GetCurrentDirectory());
121 //m_log.DebugFormat("[PLUGINS]: Trying to load {0}", dllName);
122
123 Assembly pluginAssembly = Assembly.LoadFrom(dllName); 121 Assembly pluginAssembly = Assembly.LoadFrom(dllName);
124 122
125 foreach (Type pluginType in pluginAssembly.GetTypes()) 123 foreach (Type pluginType in pluginAssembly.GetTypes())
@@ -152,4 +150,4 @@ namespace OpenSim.Server.Base
152 } 150 }
153 } 151 }
154 } 152 }
155} 153} \ No newline at end of file