diff options
author | Mike Mazur | 2009-02-04 00:01:36 +0000 |
---|---|---|
committer | Mike Mazur | 2009-02-04 00:01:36 +0000 |
commit | 0c03a48fb2060eda4d288e2d2ca4e650ce000b4b (patch) | |
tree | a90465075960c92367b0a5e62db3121e4e3a139d /OpenSim/Data/NHibernate | |
parent | * Add another object to the existing save oar test (diff) | |
download | opensim-SC-0c03a48fb2060eda4d288e2d2ca4e650ce000b4b.zip opensim-SC-0c03a48fb2060eda4d288e2d2ca4e650ce000b4b.tar.gz opensim-SC-0c03a48fb2060eda4d288e2d2ca4e650ce000b4b.tar.bz2 opensim-SC-0c03a48fb2060eda4d288e2d2ca4e650ce000b4b.tar.xz |
- add OpenSim.Framework.AssetMetadata class. AssetBase is now composed of it
- trim trailing whitespace
Diffstat (limited to 'OpenSim/Data/NHibernate')
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateAssetData.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs index fab39b1..d0046c6 100644 --- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs +++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs | |||
@@ -69,7 +69,7 @@ namespace OpenSim.Data.NHibernate | |||
69 | 69 | ||
70 | private void Save(AssetBase asset) | 70 | private void Save(AssetBase asset) |
71 | { | 71 | { |
72 | AssetBase temp = (AssetBase)manager.Load(typeof(AssetBase), asset.FullID); | 72 | AssetBase temp = (AssetBase)manager.Load(typeof(AssetBase), asset.Metadata.FullID); |
73 | if (temp == null) | 73 | if (temp == null) |
74 | { | 74 | { |
75 | manager.Save(asset); | 75 | manager.Save(asset); |
@@ -78,13 +78,13 @@ namespace OpenSim.Data.NHibernate | |||
78 | 78 | ||
79 | override public void CreateAsset(AssetBase asset) | 79 | override public void CreateAsset(AssetBase asset) |
80 | { | 80 | { |
81 | m_log.InfoFormat("[NHIBERNATE] inserting asset {0}", asset.FullID); | 81 | m_log.InfoFormat("[NHIBERNATE] inserting asset {0}", asset.Metadata.FullID); |
82 | Save(asset); | 82 | Save(asset); |
83 | } | 83 | } |
84 | 84 | ||
85 | override public void UpdateAsset(AssetBase asset) | 85 | override public void UpdateAsset(AssetBase asset) |
86 | { | 86 | { |
87 | m_log.InfoFormat("[NHIBERNATE] updating asset {0}", asset.FullID); | 87 | m_log.InfoFormat("[NHIBERNATE] updating asset {0}", asset.Metadata.FullID); |
88 | manager.Update(asset); | 88 | manager.Update(asset); |
89 | } | 89 | } |
90 | 90 | ||