ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Start of replacing the old SceneObject/Primitive classes with the new versions.

Browse Source 
PLEASE NOTE: that with this revision some prim related features may be broke for a while. (things like linking prims and the parcel prim count.)
Also this revision may not work on mono, but that will be fixed soon.
This commit is contained in:
MW
2007-08-09 17:54:22 +00:00
parent 4fbecd94b6
commit d451dddcd0
19 changed files with 301 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs
View File

@@ -24,9 +24,9 @@ namespace OpenSim.DataStore.DB4oStorage
globalIDSearch = find;
}
public bool Match(SceneObject obj)
public bool Match(SceneObjectGroup obj)
{
return obj.rootUUID == globalIDSearch;
return obj.UUID == globalIDSearch;
}
}
@@ -43,7 +43,7 @@ namespace OpenSim.DataStore.DB4oStorage
return;
}
public void StoreObject(SceneObject obj)
public void StoreObject(SceneObjectGroup obj)
{
db.Set(obj);
}
@@ -53,21 +53,21 @@ namespace OpenSim.DataStore.DB4oStorage
IObjectSet result = db.Query(new SceneObjectQuery(obj));
if (result.Count > 0)
{
SceneObject item = (SceneObject)result.Next();
SceneObjectGroup item = (SceneObjectGroup)result.Next();
db.Delete(item);
}
}
public List<SceneObject> LoadObjects()
public List<SceneObjectGroup> LoadObjects()
{
IObjectSet result = db.Get(typeof(SceneObject));
List<SceneObject> retvals = new List<SceneObject>();
IObjectSet result = db.Get(typeof(SceneObjectGroup));
List<SceneObjectGroup> retvals = new List<SceneObjectGroup>();
MainLog.Instance.Verbose("DATASTORE", "DB4O - LoadObjects found " + result.Count.ToString() + " objects");
foreach (Object obj in result)
{
retvals.Add((SceneObject)obj);
retvals.Add((SceneObjectGroup)obj);
}
return retvals;

6
OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs
View File

@@ -18,7 +18,7 @@ namespace OpenSim.DataStore.NullStorage
return;
}
public void StoreObject(SceneObject obj)
public void StoreObject(SceneObjectGroup obj)
{
}
@@ -28,9 +28,9 @@ namespace OpenSim.DataStore.NullStorage
}
public List<SceneObject> LoadObjects()
public List<SceneObjectGroup> LoadObjects()
{
return new List<SceneObject>();
return new List<SceneObjectGroup>();
}
public void StoreTerrain(double[,] ter)