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/NHibernateAssetData.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 'OpenSim/Data/NHibernate/NHibernateAssetData.cs')
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateAssetData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs index f8715cc..8f4877d 100644 --- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs +++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs | |||
@@ -59,12 +59,12 @@ namespace OpenSim.Data.NHibernate | |||
59 | 59 | ||
60 | override public AssetBase FetchAsset(UUID uuid) | 60 | override public AssetBase FetchAsset(UUID uuid) |
61 | { | 61 | { |
62 | return (AssetBase)manager.Load(typeof(AssetBase), uuid); | 62 | return (AssetBase)manager.Get(typeof(AssetBase), uuid); |
63 | } | 63 | } |
64 | 64 | ||
65 | private void Save(AssetBase asset) | 65 | private void Save(AssetBase asset) |
66 | { | 66 | { |
67 | AssetBase temp = (AssetBase)manager.Load(typeof(AssetBase), asset.Metadata.FullID); | 67 | AssetBase temp = (AssetBase)manager.Get(typeof(AssetBase), asset.Metadata.FullID); |
68 | if (temp == null) | 68 | if (temp == null) |
69 | { | 69 | { |
70 | manager.Insert(asset); | 70 | manager.Insert(asset); |