aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-10 20:04:55 +0000
committerJustin Clarke Casey2008-11-10 20:04:55 +0000
commit0e180b0ad30d5f468be1c239865688449b8747cc (patch)
tree4d442315d268836641cb2b10e6937a0d308bdc18 /OpenSim/Data
parentRemoved some debug output I forgot to remove... (diff)
downloadopensim-SC_OLD-0e180b0ad30d5f468be1c239865688449b8747cc.zip
opensim-SC_OLD-0e180b0ad30d5f468be1c239865688449b8747cc.tar.gz
opensim-SC_OLD-0e180b0ad30d5f468be1c239865688449b8747cc.tar.bz2
opensim-SC_OLD-0e180b0ad30d5f468be1c239865688449b8747cc.tar.xz
* refactor: Expose SOG.SetRootPart for outsiders to use rather than setting RootPart and adding the part separately
* Make RootPart read only
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLRegionData.cs4
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs4
-rw-r--r--OpenSim/Data/NHibernate/NHibernateRegionData.cs6
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs7
-rw-r--r--OpenSim/Data/Tests/BasicRegionTest.cs6
5 files changed, 11 insertions, 16 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index 6f4edd1..3669bdc 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -210,8 +210,8 @@ namespace OpenSim.Data.MSSQL
210 "No shape found for prim in storage, so setting default box shape"); 210 "No shape found for prim in storage, so setting default box shape");
211 prim.Shape = PrimitiveBaseShape.Default; 211 prim.Shape = PrimitiveBaseShape.Default;
212 } 212 }
213 group.AddPart(prim); 213
214 group.RootPart = prim; 214 group.SetRootPart(prim);
215 215
216 createdObjects.Add(group.UUID, group); 216 createdObjects.Add(group.UUID, group);
217 retvals.Add(group); 217 retvals.Add(group);
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 27bfec8..70940db 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -421,8 +421,8 @@ namespace OpenSim.Data.MySQL
421 "No shape found for prim in storage, so setting default box shape"); 421 "No shape found for prim in storage, so setting default box shape");
422 prim.Shape = PrimitiveBaseShape.Default; 422 prim.Shape = PrimitiveBaseShape.Default;
423 } 423 }
424 group.AddPart(prim); 424
425 group.RootPart = prim; 425 group.SetRootPart(prim);
426 createdObjects.Add(group.UUID, group); 426 createdObjects.Add(group.UUID, group);
427 retvals.Add(group); 427 retvals.Add(group);
428 LoadItems(prim); 428 LoadItems(prim);
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index ecb29fe..833f1b7 100644
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -195,8 +195,7 @@ namespace OpenSim.Data.NHibernate
195 // root part 195 // root part
196 if (p.UUID == uuid) 196 if (p.UUID == uuid)
197 { 197 {
198 group.AddPart(p); 198 group.SetRootPart(p);
199 group.RootPart = p;
200 } 199 }
201 else 200 else
202 { 201 {
@@ -244,8 +243,7 @@ namespace OpenSim.Data.NHibernate
244 if (p.UUID == p.ParentUUID) 243 if (p.UUID == p.ParentUUID)
245 { 244 {
246 SceneObjectGroup group = new SceneObjectGroup(); 245 SceneObjectGroup group = new SceneObjectGroup();
247 group.AddPart(p); 246 group.SetRootPart(p);
248 group.RootPart = p;
249 SOG.Add(p.ParentUUID, group); 247 SOG.Add(p.ParentUUID, group);
250 } 248 }
251 else 249 else
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 93d9406..cc3ad06 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -436,8 +436,8 @@ namespace OpenSim.Data.SQLite
436 "[REGION DB]: No shape found for prim in storage, so setting default box shape"); 436 "[REGION DB]: No shape found for prim in storage, so setting default box shape");
437 prim.Shape = PrimitiveBaseShape.Default; 437 prim.Shape = PrimitiveBaseShape.Default;
438 } 438 }
439 group.AddPart(prim); 439
440 group.RootPart = prim; 440 group.SetRootPart(prim);
441 createdObjects.Add(group.UUID, group); 441 createdObjects.Add(group.UUID, group);
442 retvals.Add(group); 442 retvals.Add(group);
443 LoadItems(prim); 443 LoadItems(prim);
@@ -1102,8 +1102,7 @@ namespace OpenSim.Data.SQLite
1102 // sop.TouchName = ""; 1102 // sop.TouchName = "";
1103 // sop.UUID = UUID.Random(); 1103 // sop.UUID = UUID.Random();
1104 // sop.Shape = PrimitiveBaseShape.Default; 1104 // sop.Shape = PrimitiveBaseShape.Default;
1105 // sog.AddPart(sop); 1105 // sog.SetRootPart(sop);
1106 // sog.RootPart = sop;
1107 // Add breakpoint in above line. Check sop fields. 1106 // Add breakpoint in above line. Check sop fields.
1108 1107
1109 // TODO: this doesn't work yet because something more 1108 // TODO: this doesn't work yet because something more
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index 12435c9..ab46ed4 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -315,8 +315,7 @@ namespace OpenSim.Data.Tests
315 sop.ObjectFlags = 0; 315 sop.ObjectFlags = 0;
316 316
317 SceneObjectGroup sog = new SceneObjectGroup(); 317 SceneObjectGroup sog = new SceneObjectGroup();
318 sog.AddPart(sop); 318 sog.SetRootPart(sop);
319 sog.RootPart = sop;
320 319
321 // Inserts group in DB 320 // Inserts group in DB
322 db.StoreObject(sog,region3); 321 db.StoreObject(sog,region3);
@@ -795,8 +794,7 @@ namespace OpenSim.Data.Tests
795 sop.Shape = PrimitiveBaseShape.Default; 794 sop.Shape = PrimitiveBaseShape.Default;
796 795
797 SceneObjectGroup sog = new SceneObjectGroup(); 796 SceneObjectGroup sog = new SceneObjectGroup();
798 sog.AddPart(sop); 797 sog.SetRootPart(sop);
799 sog.RootPart = sop;
800 return sog; 798 return sog;
801 } 799 }
802 800