aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples
diff options
context:
space:
mode:
authorlbsa712007-07-17 00:07:26 +0000
committerlbsa712007-07-17 00:07:26 +0000
commit47ea453b32fe8122ed2eb0d62607f65d3dbdddb8 (patch)
tree83877e94fdc053c3c0f5d2e431cbe8f49228840e /OpenSim/Region/Examples
parent* RegionApplicationBase restructuring now complete (diff)
downloadopensim-SC_OLD-47ea453b32fe8122ed2eb0d62607f65d3dbdddb8.zip
opensim-SC_OLD-47ea453b32fe8122ed2eb0d62607f65d3dbdddb8.tar.gz
opensim-SC_OLD-47ea453b32fe8122ed2eb0d62607f65d3dbdddb8.tar.bz2
opensim-SC_OLD-47ea453b32fe8122ed2eb0d62607f65d3dbdddb8.tar.xz
* debugged quite a lot of db-related strangeness and various refactoring goofs
Diffstat (limited to 'OpenSim/Region/Examples')
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs17
1 files changed, 7 insertions, 10 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index c945d39..322db2c 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -22,10 +22,6 @@ namespace SimpleApp
22{ 22{
23 class Program : RegionApplicationBase, conscmd_callback 23 class Program : RegionApplicationBase, conscmd_callback
24 { 24 {
25 public MyWorld m_scene;
26 private SceneObject m_sceneObject;
27 public MyNpcCharacter m_character;
28
29 protected override LogBase CreateLog() 25 protected override LogBase CreateLog()
30 { 26 {
31 return new LogBase(null, "SimpleApp", this, false); 27 return new LogBase(null, "SimpleApp", this, false);
@@ -40,20 +36,21 @@ namespace SimpleApp
40 LocalAssetServer assetServer = new LocalAssetServer(); 36 LocalAssetServer assetServer = new LocalAssetServer();
41 assetServer.SetServerInfo("http://localhost:8003/", ""); 37 assetServer.SetServerInfo("http://localhost:8003/", "");
42 38
43 AssetCache m_assetCache = new AssetCache(assetServer); 39 m_assetCache = new AssetCache(assetServer);
44 } 40 }
45 41
46 public void Run() 42 public void Run()
47 { 43 {
48 base.StartUp(); 44 base.StartUp();
49 45
50 CommunicationsLocal m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer); 46 m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer);
51 47
52 ScenePresence.PhysicsEngineFlying = true; 48 ScenePresence.PhysicsEngineFlying = true;
53 49
54 IPEndPoint internalEndPoint = new IPEndPoint(IPAddress.Parse("127.0.0.1"), 9000); 50 IPEndPoint internalEndPoint = new IPEndPoint(IPAddress.Parse("127.0.0.1"), 9000);
55 RegionInfo regionInfo = new RegionInfo(1000, 1000, internalEndPoint, "localhost"); 51 RegionInfo regionInfo = new RegionInfo(1000, 1000, internalEndPoint, "localhost");
56 52 regionInfo.DataStore = "simpleapp_datastore.yap";
53
57 UDPServer udpServer; 54 UDPServer udpServer;
58 55
59 Scene scene = SetupScene(regionInfo, out udpServer); 56 Scene scene = SetupScene(regionInfo, out udpServer);
@@ -64,10 +61,10 @@ namespace SimpleApp
64 shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f); 61 shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
65 LLVector3 pos = new LLVector3(138, 129, 27); 62 LLVector3 pos = new LLVector3(138, 129, 27);
66 63
67 m_sceneObject = new MySceneObject(scene, scene.EventManager, LLUUID.Zero, scene.PrimIDAllocate(), pos, shape); 64 SceneObject m_sceneObject = new MySceneObject(scene, scene.EventManager, LLUUID.Zero, scene.PrimIDAllocate(), pos, shape);
68 scene.AddEntity(m_sceneObject); 65 scene.AddEntity(m_sceneObject);
69 66
70 m_character = new MyNpcCharacter(); 67 MyNpcCharacter m_character = new MyNpcCharacter();
71 scene.AddNewClient(m_character, false); 68 scene.AddNewClient(m_character, false);
72 69
73 m_log.WriteLine(LogPriority.NORMAL, "Press enter to quit."); 70 m_log.WriteLine(LogPriority.NORMAL, "Press enter to quit.");
@@ -107,7 +104,7 @@ namespace SimpleApp
107 { 104 {
108 Program app = new Program(); 105 Program app = new Program();
109 106
110 app.StartUp(); 107 app.Run();
111 } 108 }
112 } 109 }
113} 110}