diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/Examples/SimpleModule/RegionModule.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Region/Examples/SimpleModule/RegionModule.cs')
-rw-r--r-- | OpenSim/Region/Examples/SimpleModule/RegionModule.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs index 441c696..4fc0dbb 100644 --- a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs +++ b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.IO; | 29 | using System.IO; |
30 | using libsecondlife; | 30 | using OpenMetaverse; |
31 | using Nini.Config; | 31 | using Nini.Config; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.Environment.Interfaces; | 33 | using OpenSim.Region.Environment.Interfaces; |
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
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 | // Vector3 pos = new Vector3(110, 129, 27); |
54 | 54 | ||
55 | //AddCpuCounter(regionInfo, pos); | 55 | //AddCpuCounter(regionInfo, pos); |
56 | // AddComplexObjects(regionInfo, pos); | 56 | // AddComplexObjects(regionInfo, pos); |
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
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 | // Vector3 filePos = new Vector3(100 + x, 129, 27 + z); |
71 | // x = x + 2; | 71 | // x = x + 2; |
72 | // if (x > 50) | 72 | // if (x > 50) |
73 | // { | 73 | // { |
@@ -92,29 +92,29 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
92 | foreach (ScenePresence avatar in avatars) | 92 | foreach (ScenePresence avatar in avatars) |
93 | { | 93 | { |
94 | avatar.AbsolutePosition = | 94 | avatar.AbsolutePosition = |
95 | new LLVector3((float)Util.RandomClass.Next(100, 200), (float)Util.RandomClass.Next(30, 200), 2); | 95 | new Vector3((float)Util.RandomClass.Next(100, 200), (float)Util.RandomClass.Next(30, 200), 2); |
96 | } | 96 | } |
97 | } | 97 | } |
98 | 98 | ||
99 | // private void AddComplexObjects(RegionInfo regionInfo, LLVector3 pos) | 99 | // private void AddComplexObjects(RegionInfo regionInfo, Vector3 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 | // Vector3 posOffset = new Vector3((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, UUID.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, Vector3 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, UUID.Zero, m_scene.PrimIDAllocate(), |
117 | // pos + new LLVector3(1f, 1f, 1f)); | 117 | // pos + new Vector3(1f, 1f, 1f)); |
118 | // m_scene.AddNewSceneObject(sceneObject, true); | 118 | // m_scene.AddNewSceneObject(sceneObject, true); |
119 | // } | 119 | // } |
120 | 120 | ||