aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples/SimpleApp
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Examples/SimpleApp')
-rw-r--r--OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs (renamed from OpenSim/Region/Examples/SimpleApp/MySceneObject.cs)4
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs2
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/MySceneObject.cs b/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs
index 3828b9d..26ecf01 100644
--- a/OpenSim/Region/Examples/SimpleApp/MySceneObject.cs
+++ b/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs
@@ -9,11 +9,11 @@ using System.Diagnostics;
9 9
10namespace SimpleApp 10namespace SimpleApp
11{ 11{
12 public class MySceneObject : SceneObject 12 public class CpuCounterObject : SceneObject
13 { 13 {
14 private PerformanceCounter m_counter; 14 private PerformanceCounter m_counter;
15 15
16 public MySceneObject(Scene world, EventManager eventManager, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape) 16 public CpuCounterObject(Scene world, EventManager eventManager, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape)
17 : base(world, eventManager, ownerID, localID, pos, shape ) 17 : base(world, eventManager, ownerID, localID, pos, shape )
18 { 18 {
19 String objectName = "Processor"; 19 String objectName = "Processor";
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 9d798de..4dae461 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -62,7 +62,7 @@ namespace SimpleApp
62 shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f); 62 shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
63 LLVector3 pos = new LLVector3(138, 129, 27); 63 LLVector3 pos = new LLVector3(138, 129, 27);
64 64
65 SceneObject m_sceneObject = new MySceneObject(scene, scene.EventManager, LLUUID.Zero, scene.PrimIDAllocate(), pos, shape); 65 SceneObject m_sceneObject = new CpuCounterObject(scene, scene.EventManager, LLUUID.Zero, scene.PrimIDAllocate(), pos, shape);
66 scene.AddEntity(m_sceneObject); 66 scene.AddEntity(m_sceneObject);
67 67
68 MyNpcCharacter m_character = new MyNpcCharacter( scene.EventManager ); 68 MyNpcCharacter m_character = new MyNpcCharacter( scene.EventManager );