aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs
diff options
context:
space:
mode:
authorlbsa712007-12-28 08:34:38 +0000
committerlbsa712007-12-28 08:34:38 +0000
commit8cd72beb86d2a563bdaf88b20aa76d9bafa6b971 (patch)
tree8eaac3b70eb4b62db89cdfc7b854e85fa2430255 /OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs
parent* Patch from Melanie. Thanks Melanie! (diff)
downloadopensim-SC_OLD-8cd72beb86d2a563bdaf88b20aa76d9bafa6b971.zip
opensim-SC_OLD-8cd72beb86d2a563bdaf88b20aa76d9bafa6b971.tar.gz
opensim-SC_OLD-8cd72beb86d2a563bdaf88b20aa76d9bafa6b971.tar.bz2
opensim-SC_OLD-8cd72beb86d2a563bdaf88b20aa76d9bafa6b971.tar.xz
* Moved PrimitiveBaseShape subclasses into factory methods - the subclassing scheme won't hold for serialization
* Extracted out the 'old' AddNewPrimitive that places an object at an exact pos, without the raytracing
Diffstat (limited to 'OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs')
-rw-r--r--OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs b/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs
index cbc4dea..041050d 100644
--- a/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs
+++ b/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs
@@ -39,7 +39,7 @@ namespace SimpleApp
39 private PerformanceCounter m_counter; 39 private PerformanceCounter m_counter;
40 40
41 public CpuCounterObject(Scene world, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos) 41 public CpuCounterObject(Scene world, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos)
42 : base(world, regionHandle, ownerID, localID, pos, BoxShape.Default) 42 : base(world, regionHandle, ownerID, localID, pos, PrimitiveBaseShape.Default)
43 { 43 {
44 String objectName = "Processor"; 44 String objectName = "Processor";
45 String counterName = "% Processor Time"; 45 String counterName = "% Processor Time";