diff options
| author | lbsa71 | 2007-12-28 08:34:38 +0000 |
|---|---|---|
| committer | lbsa71 | 2007-12-28 08:34:38 +0000 |
| commit | 8cd72beb86d2a563bdaf88b20aa76d9bafa6b971 (patch) | |
| tree | 8eaac3b70eb4b62db89cdfc7b854e85fa2430255 /OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs | |
| parent | * Patch from Melanie. Thanks Melanie! (diff) | |
| download | opensim-SC-8cd72beb86d2a563bdaf88b20aa76d9bafa6b971.zip opensim-SC-8cd72beb86d2a563bdaf88b20aa76d9bafa6b971.tar.gz opensim-SC-8cd72beb86d2a563bdaf88b20aa76d9bafa6b971.tar.bz2 opensim-SC-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.cs | 2 |
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"; |