aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/EntityList.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/EntityList.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/EntityList.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EntityList.cs b/OpenSim/Region/Environment/Scenes/EntityList.cs
index 09eb84f..cd59f2a 100644
--- a/OpenSim/Region/Environment/Scenes/EntityList.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityList.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Region.Environment.Scenes
71 // FindObject(UUID) 71 // FindObject(UUID)
72 // FindObject(int) 72 // FindObject(int)
73 // FindPresence(UUID) 73 // FindPresence(UUID)
74 74
75 public void Add(SceneObjectGroup obj) 75 public void Add(SceneObjectGroup obj)
76 { 76 {
77 m_obj_by_uuid[obj.UUID] = obj; 77 m_obj_by_uuid[obj.UUID] = obj;
@@ -86,7 +86,7 @@ namespace OpenSim.Region.Environment.Scenes
86 public SceneObjectGroup RemoveObject(UUID uuid) 86 public SceneObjectGroup RemoveObject(UUID uuid)
87 { 87 {
88 SceneObjectGroup sog = null; 88 SceneObjectGroup sog = null;
89 try 89 try
90 { 90 {
91 sog = (SceneObjectGroup)m_obj_by_uuid[uuid]; 91 sog = (SceneObjectGroup)m_obj_by_uuid[uuid];
92 m_obj_by_uuid.Remove(uuid); 92 m_obj_by_uuid.Remove(uuid);
@@ -99,11 +99,11 @@ namespace OpenSim.Region.Environment.Scenes
99 } 99 }
100 return sog; 100 return sog;
101 } 101 }
102 102
103 public ScenePresence RemovePresence(UUID uuid) 103 public ScenePresence RemovePresence(UUID uuid)
104 { 104 {
105 ScenePresence sp = null; 105 ScenePresence sp = null;
106 try 106 try
107 { 107 {
108 sp = (ScenePresence)m_pres_by_uuid[uuid]; 108 sp = (ScenePresence)m_pres_by_uuid[uuid];
109 m_pres_by_uuid.Remove(uuid); 109 m_pres_by_uuid.Remove(uuid);
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Environment.Scenes
113 m_log.ErrorFormat("RemovePresence failed for {0}", uuid, e); 113 m_log.ErrorFormat("RemovePresence failed for {0}", uuid, e);
114 sp = null; 114 sp = null;
115 } 115 }
116 return sp; 116 return sp;
117 } 117 }
118 118
119 public SceneObjectGroup FindObject(UUID uuid) 119 public SceneObjectGroup FindObject(UUID uuid)
@@ -132,7 +132,7 @@ namespace OpenSim.Region.Environment.Scenes
132 132
133 public SceneObjectGroup FindObject(int local) 133 public SceneObjectGroup FindObject(int local)
134 { 134 {
135 try 135 try
136 { 136 {
137 UUID uuid = (UUID)m_obj_by_local[local]; 137 UUID uuid = (UUID)m_obj_by_local[local];
138 SceneObjectGroup sog = (SceneObjectGroup)m_obj_by_uuid[uuid]; 138 SceneObjectGroup sog = (SceneObjectGroup)m_obj_by_uuid[uuid];