diff options
author | Mike Mazur | 2009-02-17 01:36:44 +0000 |
---|---|---|
committer | Mike Mazur | 2009-02-17 01:36:44 +0000 |
commit | 76c0935ec744f2d230489398f879eb7f42b11d37 (patch) | |
tree | a68253554e3899f10b6c341db369ce4a029dfaa5 /OpenSim/Data/NHibernate/NHibernateAssetData.cs | |
parent | Major change to how appearance is managed, including changes in login and use... (diff) | |
download | opensim-SC-76c0935ec744f2d230489398f879eb7f42b11d37.zip opensim-SC-76c0935ec744f2d230489398f879eb7f42b11d37.tar.gz opensim-SC-76c0935ec744f2d230489398f879eb7f42b11d37.tar.bz2 opensim-SC-76c0935ec744f2d230489398f879eb7f42b11d37.tar.xz |
- remove the Metadata property from AssetBase and return all previous
properties as before
- prefix private variables with m_ in AssetBase.cs
- related to Mantis #3122, as mentioned in
https://lists.berlios.de/pipermail/opensim-dev/2009-February/005088.html
- all services will likely need to be upgraded after this commit
Diffstat (limited to 'OpenSim/Data/NHibernate/NHibernateAssetData.cs')
-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 8f4877d..95595db 100644 --- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs +++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs | |||
@@ -64,7 +64,7 @@ namespace OpenSim.Data.NHibernate | |||
64 | 64 | ||
65 | private void Save(AssetBase asset) | 65 | private void Save(AssetBase asset) |
66 | { | 66 | { |
67 | AssetBase temp = (AssetBase)manager.Get(typeof(AssetBase), asset.Metadata.FullID); | 67 | AssetBase temp = (AssetBase)manager.Get(typeof(AssetBase), asset.FullID); |
68 | if (temp == null) | 68 | if (temp == null) |
69 | { | 69 | { |
70 | manager.Insert(asset); | 70 | manager.Insert(asset); |
@@ -73,13 +73,13 @@ namespace OpenSim.Data.NHibernate | |||
73 | 73 | ||
74 | override public void CreateAsset(AssetBase asset) | 74 | override public void CreateAsset(AssetBase asset) |
75 | { | 75 | { |
76 | m_log.InfoFormat("[NHIBERNATE] inserting asset {0}", asset.Metadata.FullID); | 76 | m_log.InfoFormat("[NHIBERNATE] inserting asset {0}", asset.FullID); |
77 | Save(asset); | 77 | Save(asset); |
78 | } | 78 | } |
79 | 79 | ||
80 | override public void UpdateAsset(AssetBase asset) | 80 | override public void UpdateAsset(AssetBase asset) |
81 | { | 81 | { |
82 | m_log.InfoFormat("[NHIBERNATE] updating asset {0}", asset.Metadata.FullID); | 82 | m_log.InfoFormat("[NHIBERNATE] updating asset {0}", asset.FullID); |
83 | manager.Update(asset); | 83 | manager.Update(asset); |
84 | } | 84 | } |
85 | 85 | ||