diff options
author | Justin Clark-Casey (justincc) | 2010-04-23 20:11:26 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-04-23 20:11:26 +0100 |
commit | f313d57fa4f658bbdb9c4c0e1c99bf3de69b100b (patch) | |
tree | db7c7436fe7c81eab481ed1e7bc969949d9646f2 /OpenSim/Data | |
parent | dispose of the DbCommand used to execute migrations after we've finished with... (diff) | |
parent | add a comment about deprecating IRegionModule (diff) | |
download | opensim-SC_OLD-f313d57fa4f658bbdb9c4c0e1c99bf3de69b100b.zip opensim-SC_OLD-f313d57fa4f658bbdb9c4c0e1c99bf3de69b100b.tar.gz opensim-SC_OLD-f313d57fa4f658bbdb9c4c0e1c99bf3de69b100b.tar.bz2 opensim-SC_OLD-f313d57fa4f658bbdb9c4c0e1c99bf3de69b100b.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/SQLiteNG/SQLiteAuthenticationData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/SQLiteNG/SQLiteAvatarData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/SQLiteNG/SQLiteEstateData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/SQLiteNG/SQLiteFramework.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/SQLiteNG/SQLiteFriendsData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/SQLiteNG/SQLiteGenericTableHandler.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/SQLiteNG/SQLiteInventoryStore.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/SQLiteNG/SQLiteRegionData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/SQLiteNG/SQLiteUserAccountData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/SQLiteNG/SQLiteUtils.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/SQLiteNG/SQLiteXInventoryData.cs | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Data/SQLiteNG/SQLiteAuthenticationData.cs b/OpenSim/Data/SQLiteNG/SQLiteAuthenticationData.cs index 086ac0a..4a5dc2e 100644 --- a/OpenSim/Data/SQLiteNG/SQLiteAuthenticationData.cs +++ b/OpenSim/Data/SQLiteNG/SQLiteAuthenticationData.cs | |||
@@ -33,7 +33,7 @@ using OpenMetaverse; | |||
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using Mono.Data.Sqlite; | 34 | using Mono.Data.Sqlite; |
35 | 35 | ||
36 | namespace OpenSim.Data.SQLite | 36 | namespace OpenSim.Data.SQLiteNG |
37 | { | 37 | { |
38 | public class SQLiteAuthenticationData : SQLiteFramework, IAuthenticationData | 38 | public class SQLiteAuthenticationData : SQLiteFramework, IAuthenticationData |
39 | { | 39 | { |
diff --git a/OpenSim/Data/SQLiteNG/SQLiteAvatarData.cs b/OpenSim/Data/SQLiteNG/SQLiteAvatarData.cs index c093884..d0fd49c 100644 --- a/OpenSim/Data/SQLiteNG/SQLiteAvatarData.cs +++ b/OpenSim/Data/SQLiteNG/SQLiteAvatarData.cs | |||
@@ -35,7 +35,7 @@ using OpenMetaverse; | |||
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using Mono.Data.Sqlite; | 36 | using Mono.Data.Sqlite; |
37 | 37 | ||
38 | namespace OpenSim.Data.SQLite | 38 | namespace OpenSim.Data.SQLiteNG |
39 | { | 39 | { |
40 | /// <summary> | 40 | /// <summary> |
41 | /// A SQLite Interface for Avatar Data | 41 | /// A SQLite Interface for Avatar Data |
diff --git a/OpenSim/Data/SQLiteNG/SQLiteEstateData.cs b/OpenSim/Data/SQLiteNG/SQLiteEstateData.cs index 9dd4a2e..2e2d717 100644 --- a/OpenSim/Data/SQLiteNG/SQLiteEstateData.cs +++ b/OpenSim/Data/SQLiteNG/SQLiteEstateData.cs | |||
@@ -35,7 +35,7 @@ using OpenMetaverse; | |||
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | 37 | ||
38 | namespace OpenSim.Data.SQLite | 38 | namespace OpenSim.Data.SQLiteNG |
39 | { | 39 | { |
40 | public class SQLiteEstateStore : IEstateDataStore | 40 | public class SQLiteEstateStore : IEstateDataStore |
41 | { | 41 | { |
diff --git a/OpenSim/Data/SQLiteNG/SQLiteFramework.cs b/OpenSim/Data/SQLiteNG/SQLiteFramework.cs index cf114d1..f0ddc59 100644 --- a/OpenSim/Data/SQLiteNG/SQLiteFramework.cs +++ b/OpenSim/Data/SQLiteNG/SQLiteFramework.cs | |||
@@ -33,7 +33,7 @@ using OpenMetaverse; | |||
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using Mono.Data.Sqlite; | 34 | using Mono.Data.Sqlite; |
35 | 35 | ||
36 | namespace OpenSim.Data.SQLite | 36 | namespace OpenSim.Data.SQLiteNG |
37 | { | 37 | { |
38 | /// <summary> | 38 | /// <summary> |
39 | /// A database interface class to a user profile storage system | 39 | /// A database interface class to a user profile storage system |
diff --git a/OpenSim/Data/SQLiteNG/SQLiteFriendsData.cs b/OpenSim/Data/SQLiteNG/SQLiteFriendsData.cs index b06853c..702a1d8 100644 --- a/OpenSim/Data/SQLiteNG/SQLiteFriendsData.cs +++ b/OpenSim/Data/SQLiteNG/SQLiteFriendsData.cs | |||
@@ -33,7 +33,7 @@ using OpenMetaverse; | |||
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using Mono.Data.Sqlite; | 34 | using Mono.Data.Sqlite; |
35 | 35 | ||
36 | namespace OpenSim.Data.SQLite | 36 | namespace OpenSim.Data.SQLiteNG |
37 | { | 37 | { |
38 | public class SQLiteFriendsData : SQLiteGenericTableHandler<FriendsData>, IFriendsData | 38 | public class SQLiteFriendsData : SQLiteGenericTableHandler<FriendsData>, IFriendsData |
39 | { | 39 | { |
diff --git a/OpenSim/Data/SQLiteNG/SQLiteGenericTableHandler.cs b/OpenSim/Data/SQLiteNG/SQLiteGenericTableHandler.cs index 3c70aef..632c5bf 100644 --- a/OpenSim/Data/SQLiteNG/SQLiteGenericTableHandler.cs +++ b/OpenSim/Data/SQLiteNG/SQLiteGenericTableHandler.cs | |||
@@ -35,7 +35,7 @@ using OpenMetaverse; | |||
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | 37 | ||
38 | namespace OpenSim.Data.SQLite | 38 | namespace OpenSim.Data.SQLiteNG |
39 | { | 39 | { |
40 | public class SQLiteGenericTableHandler<T> : SQLiteFramework where T: class, new() | 40 | public class SQLiteGenericTableHandler<T> : SQLiteFramework where T: class, new() |
41 | { | 41 | { |
diff --git a/OpenSim/Data/SQLiteNG/SQLiteInventoryStore.cs b/OpenSim/Data/SQLiteNG/SQLiteInventoryStore.cs index ece2495..9207ca3 100644 --- a/OpenSim/Data/SQLiteNG/SQLiteInventoryStore.cs +++ b/OpenSim/Data/SQLiteNG/SQLiteInventoryStore.cs | |||
@@ -34,7 +34,7 @@ using Mono.Data.Sqlite; | |||
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | 36 | ||
37 | namespace OpenSim.Data.SQLite | 37 | namespace OpenSim.Data.SQLiteNG |
38 | { | 38 | { |
39 | /// <summary> | 39 | /// <summary> |
40 | /// An Inventory Interface to the SQLite database | 40 | /// An Inventory Interface to the SQLite database |
diff --git a/OpenSim/Data/SQLiteNG/SQLiteRegionData.cs b/OpenSim/Data/SQLiteNG/SQLiteRegionData.cs index bad8adc..ee454db 100644 --- a/OpenSim/Data/SQLiteNG/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLiteNG/SQLiteRegionData.cs | |||
@@ -38,7 +38,7 @@ using OpenSim.Framework; | |||
38 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
39 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
40 | 40 | ||
41 | namespace OpenSim.Data.SQLite | 41 | namespace OpenSim.Data.SQLiteNG |
42 | { | 42 | { |
43 | /// <summary> | 43 | /// <summary> |
44 | /// A RegionData Interface to the SQLite database | 44 | /// A RegionData Interface to the SQLite database |
diff --git a/OpenSim/Data/SQLiteNG/SQLiteUserAccountData.cs b/OpenSim/Data/SQLiteNG/SQLiteUserAccountData.cs index 893f105..f77159c 100644 --- a/OpenSim/Data/SQLiteNG/SQLiteUserAccountData.cs +++ b/OpenSim/Data/SQLiteNG/SQLiteUserAccountData.cs | |||
@@ -33,7 +33,7 @@ using OpenMetaverse; | |||
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using Mono.Data.Sqlite; | 34 | using Mono.Data.Sqlite; |
35 | 35 | ||
36 | namespace OpenSim.Data.SQLite | 36 | namespace OpenSim.Data.SQLiteNG |
37 | { | 37 | { |
38 | public class SQLiteUserAccountData : SQLiteGenericTableHandler<UserAccountData>, IUserAccountData | 38 | public class SQLiteUserAccountData : SQLiteGenericTableHandler<UserAccountData>, IUserAccountData |
39 | { | 39 | { |
diff --git a/OpenSim/Data/SQLiteNG/SQLiteUtils.cs b/OpenSim/Data/SQLiteNG/SQLiteUtils.cs index 07c6b69..82a2e37 100644 --- a/OpenSim/Data/SQLiteNG/SQLiteUtils.cs +++ b/OpenSim/Data/SQLiteNG/SQLiteUtils.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Data; | 29 | using System.Data; |
30 | using Mono.Data.Sqlite; | 30 | using Mono.Data.Sqlite; |
31 | 31 | ||
32 | namespace OpenSim.Data.SQLite | 32 | namespace OpenSim.Data.SQLiteNG |
33 | { | 33 | { |
34 | /// <summary> | 34 | /// <summary> |
35 | /// A base class for methods needed by all SQLite database classes | 35 | /// A base class for methods needed by all SQLite database classes |
diff --git a/OpenSim/Data/SQLiteNG/SQLiteXInventoryData.cs b/OpenSim/Data/SQLiteNG/SQLiteXInventoryData.cs index be1d041..a0c17f8 100644 --- a/OpenSim/Data/SQLiteNG/SQLiteXInventoryData.cs +++ b/OpenSim/Data/SQLiteNG/SQLiteXInventoryData.cs | |||
@@ -34,7 +34,7 @@ using log4net; | |||
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | 36 | ||
37 | namespace OpenSim.Data.SQLite | 37 | namespace OpenSim.Data.SQLiteNG |
38 | { | 38 | { |
39 | /// <summary> | 39 | /// <summary> |
40 | /// A MySQL Interface for the Asset Server | 40 | /// A MySQL Interface for the Asset Server |