aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples
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/Examples
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/Examples')
-rw-r--r--OpenSim/Region/Examples/SimpleModule/ComplexObject.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleModule/RegionModule.cs6
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
index 8efbf27..5300750 100644
--- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Region.Examples.SimpleModule
126 if (m_parts.Count == 1) 126 if (m_parts.Count == 1)
127 { 127 {
128 m_parts.Remove(m_rootPart.UUID); 128 m_parts.Remove(m_rootPart.UUID);
129 m_scene.RemoveEntity(this); 129 m_scene.RemoveObject(this);
130 remoteClient.SendKillObject(m_regionHandle, m_rootPart.LocalId); 130 remoteClient.SendKillObject(m_regionHandle, m_rootPart.LocalId);
131 remoteClient.AddMoney(50); 131 remoteClient.AddMoney(50);
132 remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", LLUUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); 132 remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", LLUUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully);
diff --git a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
index 81abb3f..4129d61 100644
--- a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
+++ b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Region.Examples.SimpleModule
76 } 76 }
77 77
78 FileSystemObject fileObject = new FileSystemObject(m_scene, fileInfo, filePos); 78 FileSystemObject fileObject = new FileSystemObject(m_scene, fileInfo, filePos);
79 m_scene.AddEntity(fileObject); 79 m_scene.AddObject(fileObject);
80 fileObject.ScheduleGroupForFullUpdate(); 80 fileObject.ScheduleGroupForFullUpdate();
81 } 81 }
82 } 82 }
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Examples.SimpleModule
107 ComplexObject complexObject = 107 ComplexObject complexObject =
108 new ComplexObject(m_scene, regionInfo.RegionHandle, LLUUID.Zero, m_scene.PrimIDAllocate(), 108 new ComplexObject(m_scene, regionInfo.RegionHandle, LLUUID.Zero, m_scene.PrimIDAllocate(),
109 pos + posOffset); 109 pos + posOffset);
110 m_scene.AddEntity(complexObject); 110 m_scene.AddObject(complexObject);
111 } 111 }
112 } 112 }
113 113
@@ -116,7 +116,7 @@ namespace OpenSim.Region.Examples.SimpleModule
116 SceneObjectGroup sceneObject = 116 SceneObjectGroup sceneObject =
117 new CpuCounterObject(m_scene, regionInfo.RegionHandle, LLUUID.Zero, m_scene.PrimIDAllocate(), 117 new CpuCounterObject(m_scene, regionInfo.RegionHandle, LLUUID.Zero, m_scene.PrimIDAllocate(),
118 pos + new LLVector3(1f, 1f, 1f)); 118 pos + new LLVector3(1f, 1f, 1f));
119 m_scene.AddEntity(sceneObject); 119 m_scene.AddObject(sceneObject);
120 } 120 }
121 121
122 public void Close() 122 public void Close()