From 6e1bcbcf483f3ea4ab83924e7f66c708b41a18c1 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Thu, 4 Sep 2008 22:06:13 +0000
Subject: remove calls
---
OpenSim/Region/Environment/Scenes/EntityList.cs | 35 +++++++++++++++++++++++--
1 file changed, 33 insertions(+), 2 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Environment/Scenes/EntityList.cs b/OpenSim/Region/Environment/Scenes/EntityList.cs
index 4a0e668..c64e549 100644
--- a/OpenSim/Region/Environment/Scenes/EntityList.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityList.cs
@@ -57,8 +57,8 @@ namespace OpenSim.Region.Environment.Scenes
//
// Add(SOG)
// Add(SP)
- // Remove(SOG)
- // Remove(SP)
+ // RemoveObject(SOG)
+ // RemovePresence(SP)
// List()
// ListObjects()
// ListPresenes()
@@ -77,5 +77,36 @@ namespace OpenSim.Region.Environment.Scenes
{
m_pres_by_uuid[pres.UUID] = pres;
}
+
+ public SceneObjectGroup RemoveObject(LLUUID uuid)
+ {
+ SceneObjectGroup sog = null;
+ try
+ {
+ sog = (SceneObjectGroup)m_obj_by_uuid[uuid];
+ m_obj_by_uuid.Remove(uuid);
+ m_obj_by_local.Remove(sog.LocalId);
+ }
+ catch (Exception e)
+ {
+ sog = null;
+ }
+ return sog;
+ }
+
+ public ScenePresence RemovePresence(LLUUID uuid)
+ {
+ ScenePresence sp = null;
+ try
+ {
+ sp = (ScenePresence)m_pres_by_uuid[uuid];
+ m_pres_by_uuid.Remove(uuid);
+ }
+ catch (Exception e)
+ {
+ sp = null;
+ }
+ return sp;
+ }
}
}
\ No newline at end of file
--
cgit v1.1