diff options
author | Dr Scofield | 2008-06-27 23:03:39 +0000 |
---|---|---|
committer | Dr Scofield | 2008-06-27 23:03:39 +0000 |
commit | 748f72326d9a295958bc9ba63bbb1a5d39030ef7 (patch) | |
tree | 58f2c9a5f6b8ffab5ad3621070aa17cb1c1e3e6b /OpenSim/Region/Examples | |
parent | more warnings to go. (diff) | |
download | opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.zip opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.gz opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.bz2 opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.xz |
last round of warning squashing. calling it a day now.
Diffstat (limited to 'OpenSim/Region/Examples')
-rw-r--r-- | OpenSim/Region/Examples/SimpleModule/RegionModule.cs | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs index 327bd75..46b7efd 100644 --- a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs +++ b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs | |||
@@ -48,9 +48,9 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
48 | 48 | ||
49 | public void PostInitialise() | 49 | public void PostInitialise() |
50 | { | 50 | { |
51 | RegionInfo regionInfo = m_scene.RegionInfo; | 51 | // RegionInfo regionInfo = m_scene.RegionInfo; |
52 | 52 | ||
53 | LLVector3 pos = new LLVector3(110, 129, 27); | 53 | // LLVector3 pos = new LLVector3(110, 129, 27); |
54 | 54 | ||
55 | //AddCpuCounter(regionInfo, pos); | 55 | //AddCpuCounter(regionInfo, pos); |
56 | // AddComplexObjects(regionInfo, pos); | 56 | // AddComplexObjects(regionInfo, pos); |
@@ -58,27 +58,27 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
58 | // AddFileSystemObjects(); | 58 | // AddFileSystemObjects(); |
59 | } | 59 | } |
60 | 60 | ||
61 | private void AddFileSystemObjects() | 61 | // private void AddFileSystemObjects() |
62 | { | 62 | // { |
63 | DirectoryInfo dirInfo = new DirectoryInfo("."); | 63 | // DirectoryInfo dirInfo = new DirectoryInfo("."); |
64 | 64 | ||
65 | float x = 0; | 65 | // float x = 0; |
66 | float z = 0; | 66 | // float z = 0; |
67 | 67 | ||
68 | foreach (FileInfo fileInfo in dirInfo.GetFiles()) | 68 | // foreach (FileInfo fileInfo in dirInfo.GetFiles()) |
69 | { | 69 | // { |
70 | LLVector3 filePos = new LLVector3(100 + x, 129, 27 + z); | 70 | // LLVector3 filePos = new LLVector3(100 + x, 129, 27 + z); |
71 | x = x + 2; | 71 | // x = x + 2; |
72 | if (x > 50) | 72 | // if (x > 50) |
73 | { | 73 | // { |
74 | x = 0; | 74 | // x = 0; |
75 | z = z + 2; | 75 | // z = z + 2; |
76 | } | 76 | // } |
77 | 77 | ||
78 | FileSystemObject fileObject = new FileSystemObject(m_scene, fileInfo, filePos); | 78 | // FileSystemObject fileObject = new FileSystemObject(m_scene, fileInfo, filePos); |
79 | m_scene.AddNewSceneObject(fileObject, true); | 79 | // m_scene.AddNewSceneObject(fileObject, true); |
80 | } | 80 | // } |
81 | } | 81 | // } |
82 | 82 | ||
83 | private void AddAvatars() | 83 | private void AddAvatars() |
84 | { | 84 | { |
@@ -96,27 +96,27 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
96 | } | 96 | } |
97 | } | 97 | } |
98 | 98 | ||
99 | private void AddComplexObjects(RegionInfo regionInfo, LLVector3 pos) | 99 | // private void AddComplexObjects(RegionInfo regionInfo, LLVector3 pos) |
100 | { | 100 | // { |
101 | int objs = 3; | 101 | // int objs = 3; |
102 | 102 | ||
103 | for (int i = 0; i < (objs*objs*objs); i++) | 103 | // for (int i = 0; i < (objs*objs*objs); i++) |
104 | { | 104 | // { |
105 | LLVector3 posOffset = new LLVector3((i % objs) * 4, ((i % (objs*objs)) / (objs)) * 4, (i / (objs*objs)) * 4); | 105 | // LLVector3 posOffset = new LLVector3((i % objs) * 4, ((i % (objs*objs)) / (objs)) * 4, (i / (objs*objs)) * 4); |
106 | ComplexObject complexObject = | 106 | // ComplexObject complexObject = |
107 | new ComplexObject(m_scene, regionInfo.RegionHandle, LLUUID.Zero, m_scene.PrimIDAllocate(), | 107 | // new ComplexObject(m_scene, regionInfo.RegionHandle, LLUUID.Zero, m_scene.PrimIDAllocate(), |
108 | pos + posOffset); | 108 | // pos + posOffset); |
109 | m_scene.AddNewSceneObject(complexObject, true); | 109 | // m_scene.AddNewSceneObject(complexObject, true); |
110 | } | 110 | // } |
111 | } | 111 | // } |
112 | 112 | ||
113 | private void AddCpuCounter(RegionInfo regionInfo, LLVector3 pos) | 113 | // private void AddCpuCounter(RegionInfo regionInfo, LLVector3 pos) |
114 | { | 114 | // { |
115 | SceneObjectGroup sceneObject = | 115 | // SceneObjectGroup sceneObject = |
116 | new CpuCounterObject(m_scene, regionInfo.RegionHandle, LLUUID.Zero, m_scene.PrimIDAllocate(), | 116 | // new CpuCounterObject(m_scene, regionInfo.RegionHandle, LLUUID.Zero, m_scene.PrimIDAllocate(), |
117 | pos + new LLVector3(1f, 1f, 1f)); | 117 | // pos + new LLVector3(1f, 1f, 1f)); |
118 | m_scene.AddNewSceneObject(sceneObject, true); | 118 | // m_scene.AddNewSceneObject(sceneObject, true); |
119 | } | 119 | // } |
120 | 120 | ||
121 | public void Close() | 121 | public void Close() |
122 | { | 122 | { |