diff options
Start of replacing the old SceneObject/Primitive classes with the new versions.
PLEASE NOTE: that with this revision some prim related features may be broke for a while. (things like linking prims and the parcel prim count.)
Also this revision may not work on mono, but that will be fixed soon.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs b/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs index 404653d..108fa98 100644 --- a/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs +++ b/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs | |||
@@ -9,12 +9,12 @@ using System.Diagnostics; | |||
9 | 9 | ||
10 | namespace SimpleApp | 10 | namespace SimpleApp |
11 | { | 11 | { |
12 | public class CpuCounterObject : SceneObject | 12 | public class CpuCounterObject : SceneObjectGroup |
13 | { | 13 | { |
14 | private PerformanceCounter m_counter; | 14 | private PerformanceCounter m_counter; |
15 | 15 | ||
16 | public CpuCounterObject(Scene world, EventManager eventManager, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape) | 16 | public CpuCounterObject(Scene world, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape) |
17 | : base(world, eventManager, ownerID, localID, pos, shape ) | 17 | : base(world, regionHandle, ownerID, localID, pos, shape ) |
18 | { | 18 | { |
19 | String objectName = "Processor"; | 19 | String objectName = "Processor"; |
20 | String counterName = "% Processor Time"; | 20 | String counterName = "% Processor Time"; |
@@ -27,7 +27,7 @@ namespace SimpleApp | |||
27 | { | 27 | { |
28 | float cpu = m_counter.NextValue() / 40f; | 28 | float cpu = m_counter.NextValue() / 40f; |
29 | LLVector3 size = new LLVector3(cpu, cpu, cpu); | 29 | LLVector3 size = new LLVector3(cpu, cpu, cpu); |
30 | rootPrimitive.ResizeGoup( size ); | 30 | //rootPrimitive.ResizeGoup( size ); |
31 | 31 | ||
32 | base.UpdateMovement(); | 32 | base.UpdateMovement(); |
33 | } | 33 | } |