diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/ComplexObject.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs b/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs index bfd9d06..06bcdec 100644 --- a/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs +++ b/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs | |||
@@ -43,7 +43,7 @@ namespace SimpleApp | |||
43 | public RotatingWheel(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID, | 43 | public RotatingWheel(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID, |
44 | LLVector3 groupPosition, LLVector3 offsetPosition, LLQuaternion rotationDirection) | 44 | LLVector3 groupPosition, LLVector3 offsetPosition, LLQuaternion rotationDirection) |
45 | : base( | 45 | : base( |
46 | regionHandle, parent, ownerID, localID, new CylinderShape(0.5f, 0.2f), groupPosition, offsetPosition | 46 | regionHandle, parent, ownerID, localID, PrimitiveBaseShape.CreateCylinder(0.5f, 0.2f), groupPosition, offsetPosition |
47 | ) | 47 | ) |
48 | { | 48 | { |
49 | m_rotationDirection = rotationDirection; | 49 | m_rotationDirection = rotationDirection; |
@@ -64,7 +64,7 @@ namespace SimpleApp | |||
64 | 64 | ||
65 | 65 | ||
66 | public ComplexObject(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos) | 66 | public ComplexObject(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos) |
67 | : base(scene, regionHandle, ownerID, localID, pos, BoxShape.Default) | 67 | : base(scene, regionHandle, ownerID, localID, pos, PrimitiveBaseShape.Default) |
68 | { | 68 | { |
69 | m_rotationDirection = new LLQuaternion(0.05f, 0.1f, 0.15f); | 69 | m_rotationDirection = new LLQuaternion(0.05f, 0.1f, 0.15f); |
70 | 70 | ||
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"; |
diff --git a/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs b/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs index 2d8441e..3fe15ff 100644 --- a/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs +++ b/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs | |||
@@ -36,7 +36,7 @@ namespace SimpleApp | |||
36 | public class FileSystemObject : SceneObjectGroup | 36 | public class FileSystemObject : SceneObjectGroup |
37 | { | 37 | { |
38 | public FileSystemObject(Scene world, FileInfo fileInfo, LLVector3 pos) | 38 | public FileSystemObject(Scene world, FileInfo fileInfo, LLVector3 pos) |
39 | : base(world, world.RegionInfo.RegionHandle, LLUUID.Zero, world.NextLocalId, pos, BoxShape.Default) | 39 | : base(world, world.RegionInfo.RegionHandle, LLUUID.Zero, world.NextLocalId, pos, PrimitiveBaseShape.Default) |
40 | { | 40 | { |
41 | //float size = (float) Math.Pow((double) fileInfo.Length, (double) 1/3)/5; | 41 | //float size = (float) Math.Pow((double) fileInfo.Length, (double) 1/3)/5; |
42 | // rootPrimitive.ResizeGoup(new LLVector3(size, size, size)); | 42 | // rootPrimitive.ResizeGoup(new LLVector3(size, size, size)); |