aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs10
-rw-r--r--OpenSim/Grid/MessagingServer/MessageService.cs2
-rw-r--r--OpenSim/Grid/MessagingServer/PresenceInformer.cs2
-rw-r--r--OpenSim/Grid/MessagingServer/UserPresenceData.cs2
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs2
5 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index e9027ba..5ca8cf7 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -34,9 +34,9 @@ using libsecondlife;
34using Nwc.XmlRpc; 34using Nwc.XmlRpc;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
37using OpenSim.Framework.Data; 37using OpenSim.Data;
38using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
39using OpenSim.Framework.Data.MySQL; 39using OpenSim.Data.MySQL;
40 40
41namespace OpenSim.Grid.GridServer 41namespace OpenSim.Grid.GridServer
42{ 42{
@@ -602,10 +602,10 @@ namespace OpenSim.Grid.GridServer
602 602
603 foreach (KeyValuePair<string, IGridData> kvp in _plugins) 603 foreach (KeyValuePair<string, IGridData> kvp in _plugins)
604 { 604 {
605 //OpenSim.Framework.Data.MySQL.MySQLGridData dbengine = new OpenSim.Framework.Data.MySQL.MySQLGridData(); 605 //OpenSim.Data.MySQL.MySQLGridData dbengine = new OpenSim.Data.MySQL.MySQLGridData();
606 try 606 try
607 { 607 {
608 OpenSim.Framework.Data.MySQL.MySQLGridData mysqldata = (OpenSim.Framework.Data.MySQL.MySQLGridData)(kvp.Value); 608 OpenSim.Data.MySQL.MySQLGridData mysqldata = (OpenSim.Data.MySQL.MySQLGridData)(kvp.Value);
609 //DataResponse insertResponse = mysqldata.DeleteProfile(TheSim); 609 //DataResponse insertResponse = mysqldata.DeleteProfile(TheSim);
610 DataResponse insertResponse = mysqldata.DeleteProfile(uuid); 610 DataResponse insertResponse = mysqldata.DeleteProfile(uuid);
611 switch (insertResponse) 611 switch (insertResponse)
@@ -720,7 +720,7 @@ namespace OpenSim.Grid.GridServer
720 IList simProfileList = new ArrayList(); 720 IList simProfileList = new ArrayList();
721 721
722 bool fastMode = false; // MySQL Only 722 bool fastMode = false; // MySQL Only
723 fastMode = (Config.DatabaseProvider == "OpenSim.Framework.Data.MySQL.dll"); 723 fastMode = (Config.DatabaseProvider == "OpenSim.Data.MySQL.dll");
724 724
725 if (fastMode) 725 if (fastMode)
726 { 726 {
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index c4e8a58..1b16cb2 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -36,7 +36,7 @@ using libsecondlife;
36using Nwc.XmlRpc; 36using Nwc.XmlRpc;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Console; 38using OpenSim.Framework.Console;
39using OpenSim.Framework.Data; 39using OpenSim.Data;
40using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
41using FriendRights = libsecondlife.FriendRights; 41using FriendRights = libsecondlife.FriendRights;
42 42
diff --git a/OpenSim/Grid/MessagingServer/PresenceInformer.cs b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
index 9e8b230..f270bbe 100644
--- a/OpenSim/Grid/MessagingServer/PresenceInformer.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
@@ -35,7 +35,7 @@ using libsecondlife;
35using Nwc.XmlRpc; 35using Nwc.XmlRpc;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
38using OpenSim.Framework.Data; 38using OpenSim.Data;
39using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
40 40
41namespace OpenSim.Grid.MessagingServer 41namespace OpenSim.Grid.MessagingServer
diff --git a/OpenSim/Grid/MessagingServer/UserPresenceData.cs b/OpenSim/Grid/MessagingServer/UserPresenceData.cs
index a95083e..4390903 100644
--- a/OpenSim/Grid/MessagingServer/UserPresenceData.cs
+++ b/OpenSim/Grid/MessagingServer/UserPresenceData.cs
@@ -30,7 +30,7 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using libsecondlife; 31using libsecondlife;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Data; 33using OpenSim.Data;
34 34
35namespace OpenSim.Grid.MessagingServer 35namespace OpenSim.Grid.MessagingServer
36{ 36{
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 7917118..5fad88a 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -35,7 +35,7 @@ using Nwc.XmlRpc;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
38using OpenSim.Framework.Data; 38using OpenSim.Data;
39using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
40using OpenSim.Framework.Statistics; 40using OpenSim.Framework.Statistics;
41using OpenSim.Framework.UserManagement; 41using OpenSim.Framework.UserManagement;