aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/InnerScene.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-24 22:10:14 +0000
committerJustin Clarke Casey2008-05-24 22:10:14 +0000
commit79eecd3d25ccc701d5b2aba77f034c03a20b6556 (patch)
tree188b83286b22fa7f655149a9494a834985fe0e8e /OpenSim/Region/Environment/Scenes/InnerScene.cs
parent* Refactor: Push some dictionary initialization down from Scene into InnerScene (diff)
downloadopensim-SC_OLD-79eecd3d25ccc701d5b2aba77f034c03a20b6556.zip
opensim-SC_OLD-79eecd3d25ccc701d5b2aba77f034c03a20b6556.tar.gz
opensim-SC_OLD-79eecd3d25ccc701d5b2aba77f034c03a20b6556.tar.bz2
opensim-SC_OLD-79eecd3d25ccc701d5b2aba77f034c03a20b6556.tar.xz
* Refactor: Renaming various *Entity*() methods to *Object*() methods on the basis that they all take SOG parameters to improve code readability for now
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs17
1 files changed, 13 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 4615e7a..4088746 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -182,7 +182,11 @@ namespace OpenSim.Region.Environment.Scenes
182 182
183 #region Entity Methods 183 #region Entity Methods
184 184
185 public void AddEntityFromStorage(SceneObjectGroup sceneObject) 185 /// <summary>
186 /// Add an object into the scene that has come from storage
187 /// </summary>
188 /// <param name="sceneObject"></param>
189 public void AddObjectFromStorage(SceneObjectGroup sceneObject)
186 { 190 {
187 sceneObject.RegionHandle = m_regInfo.RegionHandle; 191 sceneObject.RegionHandle = m_regInfo.RegionHandle;
188 sceneObject.SetScene(m_parentScene); 192 sceneObject.SetScene(m_parentScene);
@@ -192,10 +196,15 @@ namespace OpenSim.Region.Environment.Scenes
192 196
193 } 197 }
194 sceneObject.UpdateParentIDs(); 198 sceneObject.UpdateParentIDs();
195 AddEntity(sceneObject); 199
200 AddObject(sceneObject);
196 } 201 }
197 202
198 public void AddEntity(SceneObjectGroup sceneObject) 203 /// <summary>
204 /// Add an object to the scene.
205 /// </summary>
206 /// <param name="sceneObject"></param>
207 public void AddObject(SceneObjectGroup sceneObject)
199 { 208 {
200 if (!Entities.ContainsKey(sceneObject.UUID)) 209 if (!Entities.ContainsKey(sceneObject.UUID))
201 { 210 {
@@ -290,7 +299,7 @@ namespace OpenSim.Region.Environment.Scenes
290 { 299 {
291 if (m_parentScene.ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)obj).UUID, avatar_deleter)) 300 if (m_parentScene.ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)obj).UUID, avatar_deleter))
292 { 301 {
293 m_parentScene.RemoveEntity((SceneObjectGroup)obj); 302 m_parentScene.RemoveObject((SceneObjectGroup)obj);
294 m_numPrim--; 303 m_numPrim--;
295 } 304 }
296 return; 305 return;