aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples
diff options
context:
space:
mode:
authormingchen2007-07-14 17:01:15 +0000
committermingchen2007-07-14 17:01:15 +0000
commitbf32020693b62685bc15f2e56cd2b717f4e170a7 (patch)
tree80256e8f0217533ecfd4aa6fa7f44e7c3ac49ed5 /OpenSim/Region/Examples
parent* SimpleApp finally doing something fun. :) (diff)
downloadopensim-SC_OLD-bf32020693b62685bc15f2e56cd2b717f4e170a7.zip
opensim-SC_OLD-bf32020693b62685bc15f2e56cd2b717f4e170a7.tar.gz
opensim-SC_OLD-bf32020693b62685bc15f2e56cd2b717f4e170a7.tar.bz2
opensim-SC_OLD-bf32020693b62685bc15f2e56cd2b717f4e170a7.tar.xz
*Removed ParcelManager from SceneObject and Primitive and replaced with events in EventManager
*Prim count and sim-wide prim count correctly reflect object bonus multiplier
Diffstat (limited to 'OpenSim/Region/Examples')
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MySceneObject.cs4
-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/MySceneObject.cs
index 1218dac..aab52cc 100644
--- a/OpenSim/Region/Examples/SimpleApp/MySceneObject.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MySceneObject.cs
@@ -13,8 +13,8 @@ namespace SimpleApp
13 { 13 {
14 private PerformanceCounter m_counter; 14 private PerformanceCounter m_counter;
15 15
16 public MySceneObject(Scene world, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape) 16 public MySceneObject(Scene world, EventManager eventManager, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape)
17 : base(world, ownerID, localID, pos, shape ) 17 : base(world, eventManager, ownerID, localID, pos, shape )
18 { 18 {
19 String objectName = "Processor"; 19 String objectName = "Processor";
20 String counterName = "% Processor Time"; 20 String counterName = "% Processor Time";
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 42a7add..ce60512 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -75,7 +75,7 @@ namespace SimpleApp
75 shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f); 75 shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
76 LLVector3 pos = new LLVector3(129, 129, 27); 76 LLVector3 pos = new LLVector3(129, 129, 27);
77 77
78 m_sceneObject = new MySceneObject(world, LLUUID.Zero, world.PrimIDAllocate(), pos, shape); 78 m_sceneObject = new MySceneObject(world,world.EventManager, LLUUID.Zero, world.PrimIDAllocate(), pos, shape);
79 world.AddNewEntity(m_sceneObject); 79 world.AddNewEntity(m_sceneObject);
80 80
81 m_log.WriteLine(LogPriority.NORMAL, "Press enter to quit."); 81 m_log.WriteLine(LogPriority.NORMAL, "Press enter to quit.");