diff options
author | Justin Clarke Casey | 2009-02-16 19:33:11 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-02-16 19:33:11 +0000 |
commit | 80759f708b1766b6fd36bbdb6ce69f292e64e2f0 (patch) | |
tree | 2ca913692571127b1b9bc5327ddc937b8d0211ab /OpenSim/Data/NHibernate/NHibernateGridData.cs | |
parent | line ending fixes and set native eol property (diff) | |
download | opensim-SC-80759f708b1766b6fd36bbdb6ce69f292e64e2f0.zip opensim-SC-80759f708b1766b6fd36bbdb6ce69f292e64e2f0.tar.gz opensim-SC-80759f708b1766b6fd36bbdb6ce69f292e64e2f0.tar.bz2 opensim-SC-80759f708b1766b6fd36bbdb6ce69f292e64e2f0.tar.xz |
* Apply http://opensimulator.org/mantis/view.php?id=3166
* Adds estate access list supports to NHibernate data module
* Thanks Tommil
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateGridData.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateGridData.cs b/OpenSim/Data/NHibernate/NHibernateGridData.cs index e58d1ed..b89cefc 100644 --- a/OpenSim/Data/NHibernate/NHibernateGridData.cs +++ b/OpenSim/Data/NHibernate/NHibernateGridData.cs | |||
@@ -111,7 +111,7 @@ namespace OpenSim.Data.NHibernate | |||
111 | 111 | ||
112 | public override DataResponse AddProfile(RegionProfileData profile) | 112 | public override DataResponse AddProfile(RegionProfileData profile) |
113 | { | 113 | { |
114 | if (manager.Load(typeof(RegionProfileData), profile.Uuid) == null) | 114 | if (manager.Get(typeof(RegionProfileData), profile.Uuid) == null) |
115 | { | 115 | { |
116 | manager.Insert(profile); | 116 | manager.Insert(profile); |
117 | return DataResponse.RESPONSE_OK; | 117 | return DataResponse.RESPONSE_OK; |
@@ -124,7 +124,7 @@ namespace OpenSim.Data.NHibernate | |||
124 | 124 | ||
125 | public override DataResponse UpdateProfile(RegionProfileData profile) | 125 | public override DataResponse UpdateProfile(RegionProfileData profile) |
126 | { | 126 | { |
127 | if (manager.Load(typeof(RegionProfileData), profile.Uuid) != null) | 127 | if (manager.Get(typeof(RegionProfileData), profile.Uuid) != null) |
128 | { | 128 | { |
129 | manager.Update(profile); | 129 | manager.Update(profile); |
130 | return DataResponse.RESPONSE_OK; | 130 | return DataResponse.RESPONSE_OK; |
@@ -137,7 +137,7 @@ namespace OpenSim.Data.NHibernate | |||
137 | 137 | ||
138 | public override DataResponse DeleteProfile(string uuid) | 138 | public override DataResponse DeleteProfile(string uuid) |
139 | { | 139 | { |
140 | RegionProfileData regionProfileData = (RegionProfileData)manager.Load(typeof(RegionProfileData), new UUID(uuid)); | 140 | RegionProfileData regionProfileData = (RegionProfileData)manager.Get(typeof(RegionProfileData), new UUID(uuid)); |
141 | if (regionProfileData != null) | 141 | if (regionProfileData != null) |
142 | { | 142 | { |
143 | manager.Delete(regionProfileData); | 143 | manager.Delete(regionProfileData); |
@@ -148,7 +148,7 @@ namespace OpenSim.Data.NHibernate | |||
148 | 148 | ||
149 | public override RegionProfileData GetProfileByUUID(UUID UUID) | 149 | public override RegionProfileData GetProfileByUUID(UUID UUID) |
150 | { | 150 | { |
151 | return (RegionProfileData)manager.Load(typeof(RegionProfileData), UUID); | 151 | return (RegionProfileData)manager.Get(typeof(RegionProfileData), UUID); |
152 | } | 152 | } |
153 | 153 | ||
154 | public override RegionProfileData GetProfileByHandle(ulong regionHandle) | 154 | public override RegionProfileData GetProfileByHandle(ulong regionHandle) |