diff options
author | Sean Dague | 2008-04-02 15:38:44 +0000 |
---|---|---|
committer | Sean Dague | 2008-04-02 15:38:44 +0000 |
commit | 86cf07f1c40b82b3f90bb7275444f522f14fbc9d (patch) | |
tree | 6d5b20aed04bbd92fd1db79fe628904f848b70cf /OpenSim/Grid | |
parent | attempt to fix up all refernces to new directory structure (diff) | |
download | opensim-SC-86cf07f1c40b82b3f90bb7275444f522f14fbc9d.zip opensim-SC-86cf07f1c40b82b3f90bb7275444f522f14fbc9d.tar.gz opensim-SC-86cf07f1c40b82b3f90bb7275444f522f14fbc9d.tar.bz2 opensim-SC-86cf07f1c40b82b3f90bb7275444f522f14fbc9d.tar.xz |
changing more references to OpenSim.Data
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 10 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/MessageService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/PresenceInformer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/UserPresenceData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 2 |
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; | |||
34 | using Nwc.XmlRpc; | 34 | using Nwc.XmlRpc; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
37 | using OpenSim.Framework.Data; | 37 | using OpenSim.Data; |
38 | using OpenSim.Framework.Servers; | 38 | using OpenSim.Framework.Servers; |
39 | using OpenSim.Framework.Data.MySQL; | 39 | using OpenSim.Data.MySQL; |
40 | 40 | ||
41 | namespace OpenSim.Grid.GridServer | 41 | namespace 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; | |||
36 | using Nwc.XmlRpc; | 36 | using Nwc.XmlRpc; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Console; | 38 | using OpenSim.Framework.Console; |
39 | using OpenSim.Framework.Data; | 39 | using OpenSim.Data; |
40 | using OpenSim.Framework.Servers; | 40 | using OpenSim.Framework.Servers; |
41 | using FriendRights = libsecondlife.FriendRights; | 41 | using 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; | |||
35 | using Nwc.XmlRpc; | 35 | using Nwc.XmlRpc; |
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Console; | 37 | using OpenSim.Framework.Console; |
38 | using OpenSim.Framework.Data; | 38 | using OpenSim.Data; |
39 | using OpenSim.Framework.Servers; | 39 | using OpenSim.Framework.Servers; |
40 | 40 | ||
41 | namespace OpenSim.Grid.MessagingServer | 41 | namespace 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; | |||
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Data; | 33 | using OpenSim.Data; |
34 | 34 | ||
35 | namespace OpenSim.Grid.MessagingServer | 35 | namespace 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; | |||
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Communications.Cache; | 36 | using OpenSim.Framework.Communications.Cache; |
37 | using OpenSim.Framework.Console; | 37 | using OpenSim.Framework.Console; |
38 | using OpenSim.Framework.Data; | 38 | using OpenSim.Data; |
39 | using OpenSim.Framework.Servers; | 39 | using OpenSim.Framework.Servers; |
40 | using OpenSim.Framework.Statistics; | 40 | using OpenSim.Framework.Statistics; |
41 | using OpenSim.Framework.UserManagement; | 41 | using OpenSim.Framework.UserManagement; |