diff options
Diffstat (limited to 'OpenSim/Data/NHibernate/NHibernateGridData.cs')
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateGridData.cs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateGridData.cs b/OpenSim/Data/NHibernate/NHibernateGridData.cs index 07d9ab5..836c99e 100644 --- a/OpenSim/Data/NHibernate/NHibernateGridData.cs +++ b/OpenSim/Data/NHibernate/NHibernateGridData.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -27,15 +27,14 @@ | |||
27 | 27 | ||
28 | 28 | ||
29 | using System; | 29 | using System; |
30 | using System.Collections; | ||
30 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
31 | using System.Text; | ||
32 | using log4net; | ||
33 | using System.Reflection; | 32 | using System.Reflection; |
34 | using OpenSim.Framework; | 33 | using log4net; |
35 | using NHibernate; | 34 | using NHibernate; |
36 | using NHibernate.Criterion; | 35 | using NHibernate.Criterion; |
37 | using System.Collections; | ||
38 | using OpenMetaverse; | 36 | using OpenMetaverse; |
37 | using OpenSim.Framework; | ||
39 | 38 | ||
40 | namespace OpenSim.Data.NHibernate | 39 | namespace OpenSim.Data.NHibernate |
41 | { | 40 | { |
@@ -93,7 +92,7 @@ namespace OpenSim.Data.NHibernate | |||
93 | } | 92 | } |
94 | } | 93 | } |
95 | 94 | ||
96 | public override bool AuthenticateSim(OpenMetaverse.UUID UUID, ulong regionHandle, string simrecvkey) | 95 | public override bool AuthenticateSim(UUID UUID, ulong regionHandle, string simrecvkey) |
97 | { | 96 | { |
98 | bool throwHissyFit = false; // Should be true by 1.0 | 97 | bool throwHissyFit = false; // Should be true by 1.0 |
99 | 98 | ||
@@ -147,7 +146,7 @@ namespace OpenSim.Data.NHibernate | |||
147 | return DataResponse.RESPONSE_ERROR; | 146 | return DataResponse.RESPONSE_ERROR; |
148 | } | 147 | } |
149 | 148 | ||
150 | public override RegionProfileData GetProfileByUUID(OpenMetaverse.UUID UUID) | 149 | public override RegionProfileData GetProfileByUUID(UUID UUID) |
151 | { | 150 | { |
152 | return (RegionProfileData)manager.Load(typeof(RegionProfileData), UUID); | 151 | return (RegionProfileData)manager.Load(typeof(RegionProfileData), UUID); |
153 | } | 152 | } |