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

*Trunk compiles now

Browse Source 
*Added "RemoveEntity" and renamed "AddNewEntity" to "AddEntity"
This commit is contained in:
mingchen
2007-07-16 14:56:35 +00:00
parent cba02cb632
commit d216f5779c
6 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -155,7 +155,7 @@ namespace OpenSim.Region.Environment.Scenes
List<SceneObject> PrimsFromDB = storageManager.DataStore.LoadObjects();
foreach (SceneObject prim in PrimsFromDB)
{
Prims.Add(prim.uuid, prim);
AddEntity(prim);
}
MainLog.Instance.Verbose("World.cs - loaded " + PrimsFromDB.Count.ToString() + " object(s)");
@@ -483,14 +483,40 @@ namespace OpenSim.Region.Environment.Scenes
{
SceneObject sceneOb = new SceneObject(this, m_eventManager, ownerID, this.PrimIDAllocate(), pos, shape);
AddNewEntity(sceneOb);
AddEntity(sceneOb);
}
public void AddNewEntity(SceneObject sceneObject)
public void RemovePrim(uint localID, LLUUID avatar_deleter)
{
foreach (EntityBase obj in Entities.Values)
{
if (obj is SceneObject)
{
if (((SceneObject)obj).LocalId == localID)
{
RemoveEntity((SceneObject)obj);
return;
}
}
}
}
public void AddEntity(SceneObject sceneObject)
{
this.Entities.Add(sceneObject.rootUUID, sceneObject);
}
public void RemoveEntity(SceneObject sceneObject)
{
if (this.Entities.ContainsKey(sceneObject.rootUUID))
{
m_parcelManager.removePrimFromParcelCounts(sceneObject);
this.Entities.Remove(sceneObject.rootUUID);
m_parcelManager.setPrimsTainted();
}
}
/// <summary>
/// Called by a prim when it has been created/cloned, so that its events can be subscribed to
/// </summary>