aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples
diff options
context:
space:
mode:
authorlbsa712007-09-20 07:49:11 +0000
committerlbsa712007-09-20 07:49:11 +0000
commit14d5a2e9b757c258c6ad15f0939973ef172d2d1f (patch)
treee0eb78ae9b3d3dfcc1a811b127cdb968b3d625e1 /OpenSim/Region/Examples
parent* Rewired Touch to route to group/part (Still triggering EventManager as well) (diff)
downloadopensim-SC_OLD-14d5a2e9b757c258c6ad15f0939973ef172d2d1f.zip
opensim-SC_OLD-14d5a2e9b757c258c6ad15f0939973ef172d2d1f.tar.gz
opensim-SC_OLD-14d5a2e9b757c258c6ad15f0939973ef172d2d1f.tar.bz2
opensim-SC_OLD-14d5a2e9b757c258c6ad15f0939973ef172d2d1f.tar.xz
* moved SceneManager to RegionApplicationBase
* Implemented SceneManager.StopScene() and Scene.Stop() * Some SimpleApping
Diffstat (limited to 'OpenSim/Region/Examples')
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs11
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs7
2 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
index d2dce6b..7836199 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
@@ -179,8 +179,15 @@ namespace SimpleApp
179 179
180 public virtual void SendRegionHandshake(RegionInfo regionInfo) 180 public virtual void SendRegionHandshake(RegionInfo regionInfo)
181 { 181 {
182 this.OnRegionHandShakeReply(this); 182 if (OnRegionHandShakeReply != null)
183 this.OnCompleteMovementToRegion(); 183 {
184 this.OnRegionHandShakeReply(this);
185 }
186
187 if (OnCompleteMovementToRegion != null)
188 {
189 this.OnCompleteMovementToRegion();
190 }
184 } 191 }
185 192
186 private void Update( ) 193 private void Update( )
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 52e279b..9892866 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -72,6 +72,8 @@ namespace SimpleApp
72 72
73 scene.StartTimer(); 73 scene.StartTimer();
74 74
75 m_sceneManager.Add(scene);
76
75 m_moduleLoader.PostInitialise(); 77 m_moduleLoader.PostInitialise();
76 m_moduleLoader.ClearCache(); 78 m_moduleLoader.ClearCache();
77 79
@@ -89,7 +91,7 @@ namespace SimpleApp
89 scene.AddEntity(complexObject); 91 scene.AddEntity(complexObject);
90 } 92 }
91 93
92 /*for (int i = 0; i < 500; i++) 94 for (int i = 0; i < 2; i++)
93 { 95 {
94 MyNpcCharacter m_character = new MyNpcCharacter(scene.EventManager); 96 MyNpcCharacter m_character = new MyNpcCharacter(scene.EventManager);
95 scene.AddNewClient(m_character, false); 97 scene.AddNewClient(m_character, false);
@@ -100,7 +102,8 @@ namespace SimpleApp
100 { 102 {
101 avatar.AbsolutePosition = new LLVector3((float)OpenSim.Framework.Utilities.Util.RandomClass.Next(100,200), (float)OpenSim.Framework.Utilities.Util.RandomClass.Next(30, 200), 2); 103 avatar.AbsolutePosition = new LLVector3((float)OpenSim.Framework.Utilities.Util.RandomClass.Next(100,200), (float)OpenSim.Framework.Utilities.Util.RandomClass.Next(30, 200), 2);
102 104
103 }*/ 105 }
106
104 107
105 108
106 DirectoryInfo dirInfo = new DirectoryInfo( "." ); 109 DirectoryInfo dirInfo = new DirectoryInfo( "." );