aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMW2007-06-28 11:54:51 +0000
committerMW2007-06-28 11:54:51 +0000
commit14ea54b44158a68aed767bbf5cc3497b4f64850c (patch)
tree9a31ae4546f8d801f81f7a5e22211b6570745a27 /OpenSim
parent*Added missing files from last commit (oops!) (diff)
downloadopensim-SC-14ea54b44158a68aed767bbf5cc3497b4f64850c.zip
opensim-SC-14ea54b44158a68aed767bbf5cc3497b4f64850c.tar.gz
opensim-SC-14ea54b44158a68aed767bbf5cc3497b4f64850c.tar.bz2
opensim-SC-14ea54b44158a68aed767bbf5cc3497b4f64850c.tar.xz
should now work.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs1
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs2
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index bc638dd..8c8204a 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -31,7 +31,6 @@ using System.Net;
31using System.Text; 31using System.Text;
32using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
33using System.Threading; 33using System.Threading;
34//using OpenSim.CAPS;
35using Nwc.XmlRpc; 34using Nwc.XmlRpc;
36using System.Collections; 35using System.Collections;
37using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index c98cd11..8837bdb 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Communications.Local
47 : base(serversInfo) 47 : base(serversInfo)
48 { 48 {
49 UserServices = new LocalUserServices(this , serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY); 49 UserServices = new LocalUserServices(this , serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY);
50 UserServices.AddPlugin("OpenGrid.Framework.Data.DB4o.dll"); 50 UserServices.AddPlugin("OpenSim.Framework.Data.DB4o.dll");
51 UserServer = UserServices; 51 UserServer = UserServices;
52 GridServer = SandBoxServices; 52 GridServer = SandBoxServices;
53 InterRegion = SandBoxServices; 53 InterRegion = SandBoxServices;