aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorMike Mazur2009-02-17 01:36:44 +0000
committerMike Mazur2009-02-17 01:36:44 +0000
commit76c0935ec744f2d230489398f879eb7f42b11d37 (patch)
treea68253554e3899f10b6c341db369ce4a029dfaa5 /OpenSim/Data
parentMajor change to how appearance is managed, including changes in login and use... (diff)
downloadopensim-SC_OLD-76c0935ec744f2d230489398f879eb7f42b11d37.zip
opensim-SC_OLD-76c0935ec744f2d230489398f879eb7f42b11d37.tar.gz
opensim-SC_OLD-76c0935ec744f2d230489398f879eb7f42b11d37.tar.bz2
opensim-SC_OLD-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')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLAssetData.cs40
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs34
-rw-r--r--OpenSim/Data/NHibernate/NHibernateAssetData.cs6
-rw-r--r--OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml18
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs46
-rw-r--r--OpenSim/Data/Tests/BasicAssetTest.cs12
6 files changed, 77 insertions, 79 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index 27deef7..0361a7d 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -132,12 +132,12 @@ namespace OpenSim.Data.MSSQL
132 { 132 {
133 AssetBase asset = new AssetBase(); 133 AssetBase asset = new AssetBase();
134 // Region Main 134 // Region Main
135 asset.Metadata.FullID = new UUID((string)reader["id"]); 135 asset.FullID = new UUID((string)reader["id"]);
136 asset.Metadata.Name = (string)reader["name"]; 136 asset.Name = (string)reader["name"];
137 asset.Metadata.Description = (string)reader["description"]; 137 asset.Description = (string)reader["description"];
138 asset.Metadata.Type = Convert.ToSByte(reader["assetType"]); 138 asset.Type = Convert.ToSByte(reader["assetType"]);
139 asset.Metadata.Local = Convert.ToBoolean(reader["local"]); 139 asset.Local = Convert.ToBoolean(reader["local"]);
140 asset.Metadata.Temporary = Convert.ToBoolean(reader["temporary"]); 140 asset.Temporary = Convert.ToBoolean(reader["temporary"]);
141 asset.Data = (byte[])reader["data"]; 141 asset.Data = (byte[])reader["data"];
142 return asset; 142 return asset;
143 } 143 }
@@ -152,7 +152,7 @@ namespace OpenSim.Data.MSSQL
152 /// <param name="asset">the asset</param> 152 /// <param name="asset">the asset</param>
153 override public void CreateAsset(AssetBase asset) 153 override public void CreateAsset(AssetBase asset)
154 { 154 {
155 if (ExistsAsset(asset.Metadata.FullID)) 155 if (ExistsAsset(asset.FullID))
156 { 156 {
157 return; 157 return;
158 } 158 }
@@ -163,12 +163,12 @@ namespace OpenSim.Data.MSSQL
163 "(@id, @name, @description, @assetType, @local, @temporary, @create_time, @access_time, @data)")) 163 "(@id, @name, @description, @assetType, @local, @temporary, @create_time, @access_time, @data)"))
164 { 164 {
165 int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000); 165 int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
166 command.Parameters.Add(database.CreateParameter("id", asset.Metadata.FullID)); 166 command.Parameters.Add(database.CreateParameter("id", asset.FullID));
167 command.Parameters.Add(database.CreateParameter("name", asset.Metadata.Name)); 167 command.Parameters.Add(database.CreateParameter("name", asset.Name));
168 command.Parameters.Add(database.CreateParameter("description", asset.Metadata.Description)); 168 command.Parameters.Add(database.CreateParameter("description", asset.Description));
169 command.Parameters.Add(database.CreateParameter("assetType", asset.Metadata.Type)); 169 command.Parameters.Add(database.CreateParameter("assetType", asset.Type));
170 command.Parameters.Add(database.CreateParameter("local", asset.Metadata.Local)); 170 command.Parameters.Add(database.CreateParameter("local", asset.Local));
171 command.Parameters.Add(database.CreateParameter("temporary", asset.Metadata.Temporary)); 171 command.Parameters.Add(database.CreateParameter("temporary", asset.Temporary));
172 command.Parameters.Add(database.CreateParameter("access_time", now)); 172 command.Parameters.Add(database.CreateParameter("access_time", now));
173 command.Parameters.Add(database.CreateParameter("create_time", now)); 173 command.Parameters.Add(database.CreateParameter("create_time", now));
174 command.Parameters.Add(database.CreateParameter("data", asset.Data)); 174 command.Parameters.Add(database.CreateParameter("data", asset.Data));
@@ -192,14 +192,14 @@ namespace OpenSim.Data.MSSQL
192 "data = @data where " + 192 "data = @data where " +
193 "id = @keyId;")) 193 "id = @keyId;"))
194 { 194 {
195 command.Parameters.Add(database.CreateParameter("id", asset.Metadata.FullID)); 195 command.Parameters.Add(database.CreateParameter("id", asset.FullID));
196 command.Parameters.Add(database.CreateParameter("name", asset.Metadata.Name)); 196 command.Parameters.Add(database.CreateParameter("name", asset.Name));
197 command.Parameters.Add(database.CreateParameter("description", asset.Metadata.Description)); 197 command.Parameters.Add(database.CreateParameter("description", asset.Description));
198 command.Parameters.Add(database.CreateParameter("assetType", asset.Metadata.Type)); 198 command.Parameters.Add(database.CreateParameter("assetType", asset.Type));
199 command.Parameters.Add(database.CreateParameter("local", asset.Metadata.Local)); 199 command.Parameters.Add(database.CreateParameter("local", asset.Local));
200 command.Parameters.Add(database.CreateParameter("temporary", asset.Metadata.Temporary)); 200 command.Parameters.Add(database.CreateParameter("temporary", asset.Temporary));
201 command.Parameters.Add(database.CreateParameter("data", asset.Data)); 201 command.Parameters.Add(database.CreateParameter("data", asset.Data));
202 command.Parameters.Add(database.CreateParameter("@keyId", asset.Metadata.FullID)); 202 command.Parameters.Add(database.CreateParameter("@keyId", asset.FullID));
203 203
204 try 204 try
205 { 205 {
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 508e053..2211d4c 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -137,18 +137,18 @@ namespace OpenSim.Data.MySQL
137 { 137 {
138 asset = new AssetBase(); 138 asset = new AssetBase();
139 asset.Data = (byte[]) dbReader["data"]; 139 asset.Data = (byte[]) dbReader["data"];
140 asset.Metadata.Description = (string) dbReader["description"]; 140 asset.Description = (string) dbReader["description"];
141 asset.Metadata.FullID = assetID; 141 asset.FullID = assetID;
142 try 142 try
143 { 143 {
144 asset.Metadata.Local = (bool)dbReader["local"]; 144 asset.Local = (bool)dbReader["local"];
145 } 145 }
146 catch (InvalidCastException) 146 catch (InvalidCastException)
147 { 147 {
148 asset.Metadata.Local = false; 148 asset.Local = false;
149 } 149 }
150 asset.Metadata.Name = (string) dbReader["name"]; 150 asset.Name = (string) dbReader["name"];
151 asset.Metadata.Type = (sbyte) dbReader["assetType"]; 151 asset.Type = (sbyte) dbReader["assetType"];
152 } 152 }
153 dbReader.Close(); 153 dbReader.Close();
154 cmd.Dispose(); 154 cmd.Dispose();
@@ -176,8 +176,8 @@ namespace OpenSim.Data.MySQL
176 { 176 {
177 lock (_dbConnection) 177 lock (_dbConnection)
178 { 178 {
179 //m_log.Info("[ASSET DB]: Creating Asset " + Util.ToRawUuidString(asset.Metadata.FullID)); 179 //m_log.Info("[ASSET DB]: Creating Asset " + Util.ToRawUuidString(asset.FullID));
180 if (ExistsAsset(asset.Metadata.FullID)) 180 if (ExistsAsset(asset.FullID))
181 { 181 {
182 //m_log.Info("[ASSET DB]: Asset exists already, ignoring."); 182 //m_log.Info("[ASSET DB]: Asset exists already, ignoring.");
183 return; 183 return;
@@ -198,12 +198,12 @@ namespace OpenSim.Data.MySQL
198 { 198 {
199 // create unix epoch time 199 // create unix epoch time
200 int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000); 200 int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
201 cmd.Parameters.AddWithValue("?id", asset.Metadata.ID); 201 cmd.Parameters.AddWithValue("?id", asset.ID);
202 cmd.Parameters.AddWithValue("?name", asset.Metadata.Name); 202 cmd.Parameters.AddWithValue("?name", asset.Name);
203 cmd.Parameters.AddWithValue("?description", asset.Metadata.Description); 203 cmd.Parameters.AddWithValue("?description", asset.Description);
204 cmd.Parameters.AddWithValue("?assetType", asset.Metadata.Type); 204 cmd.Parameters.AddWithValue("?assetType", asset.Type);
205 cmd.Parameters.AddWithValue("?local", asset.Metadata.Local); 205 cmd.Parameters.AddWithValue("?local", asset.Local);
206 cmd.Parameters.AddWithValue("?temporary", asset.Metadata.Temporary); 206 cmd.Parameters.AddWithValue("?temporary", asset.Temporary);
207 cmd.Parameters.AddWithValue("?create_time", now); 207 cmd.Parameters.AddWithValue("?create_time", now);
208 cmd.Parameters.AddWithValue("?access_time", now); 208 cmd.Parameters.AddWithValue("?access_time", now);
209 cmd.Parameters.AddWithValue("?data", asset.Data); 209 cmd.Parameters.AddWithValue("?data", asset.Data);
@@ -216,7 +216,7 @@ namespace OpenSim.Data.MySQL
216 m_log.ErrorFormat( 216 m_log.ErrorFormat(
217 "[ASSETS DB]: " + 217 "[ASSETS DB]: " +
218 "MySql failure creating asset {0} with name {1}" + Environment.NewLine + e.ToString() 218 "MySql failure creating asset {0} with name {1}" + Environment.NewLine + e.ToString()
219 + Environment.NewLine + "Attempting reconnection", asset.Metadata.FullID, asset.Metadata.Name); 219 + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name);
220 _dbConnection.Reconnect(); 220 _dbConnection.Reconnect();
221 } 221 }
222 } 222 }
@@ -239,7 +239,7 @@ namespace OpenSim.Data.MySQL
239 { 239 {
240 // create unix epoch time 240 // create unix epoch time
241 int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000); 241 int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
242 cmd.Parameters.AddWithValue("?id", asset.Metadata.ID); 242 cmd.Parameters.AddWithValue("?id", asset.ID);
243 cmd.Parameters.AddWithValue("?access_time", now); 243 cmd.Parameters.AddWithValue("?access_time", now);
244 cmd.ExecuteNonQuery(); 244 cmd.ExecuteNonQuery();
245 cmd.Dispose(); 245 cmd.Dispose();
@@ -250,7 +250,7 @@ namespace OpenSim.Data.MySQL
250 m_log.ErrorFormat( 250 m_log.ErrorFormat(
251 "[ASSETS DB]: " + 251 "[ASSETS DB]: " +
252 "MySql failure updating access_time for asset {0} with name {1}" + Environment.NewLine + e.ToString() 252 "MySql failure updating access_time for asset {0} with name {1}" + Environment.NewLine + e.ToString()
253 + Environment.NewLine + "Attempting reconnection", asset.Metadata.FullID, asset.Metadata.Name); 253 + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name);
254 _dbConnection.Reconnect(); 254 _dbConnection.Reconnect();
255 } 255 }
256 } 256 }
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
diff --git a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
index db400ea..cb8b36d 100644
--- a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
@@ -1,16 +1,14 @@
1<?xml version="1.0" encoding="utf-8" ?> 1<?xml version="1.0" encoding="utf-8" ?>
2<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"> 2<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
3 <class name="OpenSim.Framework.AssetBase, OpenSim.Framework" table="Assets" lazy="false"> 3 <class name="OpenSim.Framework.AssetBase, OpenSim.Framework" table="Assets" lazy="false">
4 <id name="FullID" column="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 4 <id name="FullID" column="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
5 <generator class="assigned" /> 5 <generator class="assigned" />
6 </id> 6 </id>
7 <property name="Type" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" />
8 <property name="Name" type="String" length="64" />
9 <property name="Description" type="String" length="64" />
10 <property name="Local" type="boolean" />
11 <property name="Temporary" type="boolean" />
7 <property name="Data" type="binary" /> 12 <property name="Data" type="binary" />
8 <component name="Metadata">
9 <property name="Type" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" />
10 <property name="Name" type="String" length="64" />
11 <property name="Description" type="String" length="64" />
12 <property name="Local" type="boolean" />
13 <property name="Temporary" type="boolean" />
14 </component>
15 </class> 13 </class>
16</hibernate-mapping> 14</hibernate-mapping>
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index f6f62a7..1b42198 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -125,8 +125,8 @@ namespace OpenSim.Data.SQLite
125 /// <param name="asset">Asset Base</param> 125 /// <param name="asset">Asset Base</param>
126 override public void CreateAsset(AssetBase asset) 126 override public void CreateAsset(AssetBase asset)
127 { 127 {
128 //m_log.Info("[ASSET DB]: Creating Asset " + Util.ToRawUuidString(asset.Metadata.FullID)); 128 //m_log.Info("[ASSET DB]: Creating Asset " + Util.ToRawUuidString(asset.FullID));
129 if (ExistsAsset(asset.Metadata.FullID)) 129 if (ExistsAsset(asset.FullID))
130 { 130 {
131 //m_log.Info("[ASSET DB]: Asset exists already, ignoring."); 131 //m_log.Info("[ASSET DB]: Asset exists already, ignoring.");
132 } 132 }
@@ -136,12 +136,12 @@ namespace OpenSim.Data.SQLite
136 { 136 {
137 using (SqliteCommand cmd = new SqliteCommand(InsertAssetSQL, m_conn)) 137 using (SqliteCommand cmd = new SqliteCommand(InsertAssetSQL, m_conn))
138 { 138 {
139 cmd.Parameters.Add(new SqliteParameter(":UUID", Util.ToRawUuidString(asset.Metadata.FullID))); 139 cmd.Parameters.Add(new SqliteParameter(":UUID", Util.ToRawUuidString(asset.FullID)));
140 cmd.Parameters.Add(new SqliteParameter(":Name", asset.Metadata.Name)); 140 cmd.Parameters.Add(new SqliteParameter(":Name", asset.Name));
141 cmd.Parameters.Add(new SqliteParameter(":Description", asset.Metadata.Description)); 141 cmd.Parameters.Add(new SqliteParameter(":Description", asset.Description));
142 cmd.Parameters.Add(new SqliteParameter(":Type", asset.Metadata.Type)); 142 cmd.Parameters.Add(new SqliteParameter(":Type", asset.Type));
143 cmd.Parameters.Add(new SqliteParameter(":Local", asset.Metadata.Local)); 143 cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local));
144 cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Metadata.Temporary)); 144 cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary));
145 cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data)); 145 cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
146 146
147 cmd.ExecuteNonQuery(); 147 cmd.ExecuteNonQuery();
@@ -162,12 +162,12 @@ namespace OpenSim.Data.SQLite
162 { 162 {
163 using (SqliteCommand cmd = new SqliteCommand(UpdateAssetSQL, m_conn)) 163 using (SqliteCommand cmd = new SqliteCommand(UpdateAssetSQL, m_conn))
164 { 164 {
165 cmd.Parameters.Add(new SqliteParameter(":UUID", Util.ToRawUuidString(asset.Metadata.FullID))); 165 cmd.Parameters.Add(new SqliteParameter(":UUID", Util.ToRawUuidString(asset.FullID)));
166 cmd.Parameters.Add(new SqliteParameter(":Name", asset.Metadata.Name)); 166 cmd.Parameters.Add(new SqliteParameter(":Name", asset.Name));
167 cmd.Parameters.Add(new SqliteParameter(":Description", asset.Metadata.Description)); 167 cmd.Parameters.Add(new SqliteParameter(":Description", asset.Description));
168 cmd.Parameters.Add(new SqliteParameter(":Type", asset.Metadata.Type)); 168 cmd.Parameters.Add(new SqliteParameter(":Type", asset.Type));
169 cmd.Parameters.Add(new SqliteParameter(":Local", asset.Metadata.Local)); 169 cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local));
170 cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Metadata.Temporary)); 170 cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary));
171 cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data)); 171 cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
172 172
173 cmd.ExecuteNonQuery(); 173 cmd.ExecuteNonQuery();
@@ -181,14 +181,14 @@ namespace OpenSim.Data.SQLite
181 /// <param name="asset"></param> 181 /// <param name="asset"></param>
182 private static void LogAssetLoad(AssetBase asset) 182 private static void LogAssetLoad(AssetBase asset)
183 { 183 {
184 string temporary = asset.Metadata.Temporary ? "Temporary" : "Stored"; 184 string temporary = asset.Temporary ? "Temporary" : "Stored";
185 string local = asset.Metadata.Local ? "Local" : "Remote"; 185 string local = asset.Local ? "Local" : "Remote";
186 186
187 int assetLength = (asset.Data != null) ? asset.Data.Length : 0; 187 int assetLength = (asset.Data != null) ? asset.Data.Length : 0;
188 188
189 m_log.Info("[ASSET DB]: " + 189 m_log.Info("[ASSET DB]: " +
190 string.Format("Loaded {6} {5} Asset: [{0}][{3}] \"{1}\":{2} ({7} bytes)", 190 string.Format("Loaded {6} {5} Asset: [{0}][{3}] \"{1}\":{2} ({7} bytes)",
191 asset.Metadata.FullID, asset.Metadata.Name, asset.Metadata.Description, asset.Metadata.Type, 191 asset.FullID, asset.Name, asset.Description, asset.Type,
192 temporary, local, assetLength)); 192 temporary, local, assetLength));
193 } 193 }
194 194
@@ -246,12 +246,12 @@ namespace OpenSim.Data.SQLite
246 // back out. Not enough time to figure it out yet. 246 // back out. Not enough time to figure it out yet.
247 AssetBase asset = new AssetBase(); 247 AssetBase asset = new AssetBase();
248 248
249 asset.Metadata.FullID = new UUID((String) row["UUID"]); 249 asset.FullID = new UUID((String) row["UUID"]);
250 asset.Metadata.Name = (String) row["Name"]; 250 asset.Name = (String) row["Name"];
251 asset.Metadata.Description = (String) row["Description"]; 251 asset.Description = (String) row["Description"];
252 asset.Metadata.Type = Convert.ToSByte(row["Type"]); 252 asset.Type = Convert.ToSByte(row["Type"]);
253 asset.Metadata.Local = Convert.ToBoolean(row["Local"]); 253 asset.Local = Convert.ToBoolean(row["Local"]);
254 asset.Metadata.Temporary = Convert.ToBoolean(row["Temporary"]); 254 asset.Temporary = Convert.ToBoolean(row["Temporary"]);
255 asset.Data = (byte[]) row["Data"]; 255 asset.Data = (byte[]) row["Data"];
256 return asset; 256 return asset;
257 } 257 }
diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs
index 4d2bbc7..500b646 100644
--- a/OpenSim/Data/Tests/BasicAssetTest.cs
+++ b/OpenSim/Data/Tests/BasicAssetTest.cs
@@ -83,16 +83,16 @@ namespace OpenSim.Data.Tests
83 db.CreateAsset(a3); 83 db.CreateAsset(a3);
84 84
85 AssetBase a1a = db.FetchAsset(uuid1); 85 AssetBase a1a = db.FetchAsset(uuid1);
86 Assert.That(a1.Metadata.ID, Is.EqualTo(a1a.Metadata.ID)); 86 Assert.That(a1.ID, Is.EqualTo(a1a.ID));
87 Assert.That(a1.Metadata.Name, Is.EqualTo(a1a.Metadata.Name)); 87 Assert.That(a1.Name, Is.EqualTo(a1a.Name));
88 88
89 AssetBase a2a = db.FetchAsset(uuid2); 89 AssetBase a2a = db.FetchAsset(uuid2);
90 Assert.That(a2.Metadata.ID, Is.EqualTo(a2a.Metadata.ID)); 90 Assert.That(a2.ID, Is.EqualTo(a2a.ID));
91 Assert.That(a2.Metadata.Name, Is.EqualTo(a2a.Metadata.Name)); 91 Assert.That(a2.Name, Is.EqualTo(a2a.Name));
92 92
93 AssetBase a3a = db.FetchAsset(uuid3); 93 AssetBase a3a = db.FetchAsset(uuid3);
94 Assert.That(a3.Metadata.ID, Is.EqualTo(a3a.Metadata.ID)); 94 Assert.That(a3.ID, Is.EqualTo(a3a.ID));
95 Assert.That(a3.Metadata.Name, Is.EqualTo(a3a.Metadata.Name)); 95 Assert.That(a3.Name, Is.EqualTo(a3a.Name));
96 } 96 }
97 97
98 [Test] 98 [Test]