aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Examples')
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyWorld.cs18
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs24
-rw-r--r--OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj18
-rw-r--r--OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build3
4 files changed, 40 insertions, 23 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index 89f39d3..fe1fc16 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -44,7 +44,7 @@ namespace SimpleApp
44 44
45 #region IWorld Members 45 #region IWorld Members
46 46
47 override public void AddNewClient(IClientAPI client, LLUUID agentID, bool child) 47 override public void AddNewClient(IClientAPI client, bool child)
48 48
49 { 49 {
50 LLVector3 pos = new LLVector3(128, 128, 128); 50 LLVector3 pos = new LLVector3(128, 128, 128);
@@ -59,7 +59,13 @@ namespace SimpleApp
59 }; 59 };
60 60
61 client.OnRequestWearables += SendWearables; 61 client.OnRequestWearables += SendWearables;
62 62 client.OnAddPrim += AddNewPrim;
63 client.OnUpdatePrimPosition += this.UpdatePrimPosition;
64 client.OnRequestMapBlocks += this.RequestMapBlocks;
65 client.OnTeleportLocationRequest += this.RequestTeleportLocation;
66 client.OnGrapUpdate += this.MoveObject;
67 client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
68
63 client.OnCompleteMovementToRegion += delegate() 69 client.OnCompleteMovementToRegion += delegate()
64 { 70 {
65 client.MoveAgentIntoRegion(m_regionInfo, pos, LLVector3.Zero ); 71 client.MoveAgentIntoRegion(m_regionInfo, pos, LLVector3.Zero );
@@ -76,7 +82,7 @@ namespace SimpleApp
76 82
77 client.SendRegionHandshake(m_regionInfo); 83 client.SendRegionHandshake(m_regionInfo);
78 84
79 OpenSim.Region.Environment.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo ); 85 CreateAndAddScenePresence(client);
80 86
81 } 87 }
82 88
@@ -85,12 +91,6 @@ namespace SimpleApp
85 client.SendWearables( AvatarWearable.DefaultWearables ); 91 client.SendWearables( AvatarWearable.DefaultWearables );
86 } 92 }
87 93
88
89 override public void RemoveClient(LLUUID agentID)
90 {
91
92 }
93
94 public RegionInfo RegionInfo 94 public RegionInfo RegionInfo
95 { 95 {
96 get { return m_regionInfo; } 96 get { return m_regionInfo; }
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 4060d68..0d5b4b3 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -14,6 +14,7 @@ using OpenSim.Region.Caches;
14using OpenSim.Framework.Communications; 14using OpenSim.Framework.Communications;
15using OpenSim.Region.Communications.Local; 15using OpenSim.Region.Communications.Local;
16using OpenSim.Region.ClientStack; 16using OpenSim.Region.ClientStack;
17using OpenSim.Region.Physics.BasicPhysicsPlugin;
17 18
18namespace SimpleApp 19namespace SimpleApp
19{ 20{
@@ -32,11 +33,7 @@ namespace SimpleApp
32 33
33 string simAddr = "127.0.0.1"; 34 string simAddr = "127.0.0.1";
34 int simPort = 9000; 35 int simPort = 9000;
35 /* 36
36 LoginServer loginServer = new LoginServer( simAddr, simPort, 0, 0, false );
37 loginServer.Startup();
38 loginServer.SetSessionHandler( AddNewSessionHandler );*/
39
40 m_circuitManager = new AuthenticateSessionsBase(); 37 m_circuitManager = new AuthenticateSessionsBase();
41 38
42 InventoryCache inventoryCache = new InventoryCache(); 39 InventoryCache inventoryCache = new InventoryCache();
@@ -53,18 +50,17 @@ namespace SimpleApp
53 50
54 ClientView.TerrainManager = new TerrainManager(new SecondLife()); 51 ClientView.TerrainManager = new TerrainManager(new SecondLife());
55 52
56 CommunicationsManager communicationsManager = new CommunicationsLocal(null); 53 NetworkServersInfo serverInfo = new NetworkServersInfo();
54 CommunicationsLocal communicationsManager = new CommunicationsLocal(serverInfo);
55
56 RegionInfo regionInfo = new RegionInfo( 1000, 1000, simAddr, simPort, simAddr );
57 57
58 RegionInfo regionInfo = new RegionInfo( );
59 BaseHttpServer httpServer = new BaseHttpServer(simPort); 58 BaseHttpServer httpServer = new BaseHttpServer(simPort);
60 udpServer.LocalWorld = new MyWorld( packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer ); 59 MyWorld world = new MyWorld(packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer);
61 60 world.PhysScene = new BasicScene();
62 // World world = new World(udpServer.PacketServer.ClientAPIs, regionInfo); 61 udpServer.LocalWorld = world;
63 // PhysicsScene physicsScene = new NullPhysicsScene();
64 // world.PhysicsScene = physicsScene;
65 // udpServer.LocalWorld = world;
66 62
67 // httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod ); 63 httpServer.AddXmlRPCHandler("login_to_simulator", communicationsManager.UserServices.XmlRpcLoginMethod );
68 httpServer.Start(); 64 httpServer.Start();
69 65
70 m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit."); 66 m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
index 0a82172..d39d091 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
@@ -104,6 +104,12 @@
104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
105 <Private>False</Private> 105 <Private>False</Private>
106 </ProjectReference> 106 </ProjectReference>
107 <ProjectReference Include="..\..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
108 <Name>OpenSim.Framework.UserManagement</Name>
109 <Project>{586E2916-0000-0000-0000-000000000000}</Project>
110 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
111 <Private>False</Private>
112 </ProjectReference>
107 <ProjectReference Include="..\..\Caches\OpenSim.Region.Caches.csproj"> 113 <ProjectReference Include="..\..\Caches\OpenSim.Region.Caches.csproj">
108 <Name>OpenSim.Region.Caches</Name> 114 <Name>OpenSim.Region.Caches</Name>
109 <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project> 115 <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
@@ -134,6 +140,18 @@
134 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 140 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
135 <Private>False</Private> 141 <Private>False</Private>
136 </ProjectReference> 142 </ProjectReference>
143 <ProjectReference Include="..\..\Physics\BasicPhysicsPlugin\OpenSim.Region.Physics.BasicPhysicsPlugin.csproj">
144 <Name>OpenSim.Region.Physics.BasicPhysicsPlugin</Name>
145 <Project>{15B4FEF3-0000-0000-0000-000000000000}</Project>
146 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
147 <Private>False</Private>
148 </ProjectReference>
149 <ProjectReference Include="..\..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
150 <Name>OpenSim.Region.Physics.Manager</Name>
151 <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
152 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
153 <Private>False</Private>
154 </ProjectReference>
137 </ItemGroup> 155 </ItemGroup>
138 <ItemGroup> 156 <ItemGroup>
139 <Compile Include="MyWorld.cs"> 157 <Compile Include="MyWorld.cs">
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
index f8896fa..db44992 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
@@ -25,11 +25,14 @@
25 <include name="../../../../bin/OpenSim.Framework.Communications.dll" /> 25 <include name="../../../../bin/OpenSim.Framework.Communications.dll" />
26 <include name="../../../../bin/OpenSim.Framework.Console.dll" /> 26 <include name="../../../../bin/OpenSim.Framework.Console.dll" />
27 <include name="../../../../bin/OpenSim.Framework.Servers.dll" /> 27 <include name="../../../../bin/OpenSim.Framework.Servers.dll" />
28 <include name="../../../../bin/OpenSim.Framework.UserManagement.dll" />
28 <include name="../../../../bin/OpenSim.Region.Caches.dll" /> 29 <include name="../../../../bin/OpenSim.Region.Caches.dll" />
29 <include name="../../../../bin/OpenSim.Region.ClientStack.dll" /> 30 <include name="../../../../bin/OpenSim.Region.ClientStack.dll" />
30 <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" /> 31 <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" />
31 <include name="../../../../bin/OpenSim.Region.Environment.dll" /> 32 <include name="../../../../bin/OpenSim.Region.Environment.dll" />
32 <include name="../../../../bin/OpenSim.Region.GridInterfaces.Local.dll" /> 33 <include name="../../../../bin/OpenSim.Region.GridInterfaces.Local.dll" />
34 <include name="../../../../bin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll" />
35 <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" />
33 <include name="System.dll" /> 36 <include name="System.dll" />
34 <include name="System.Data.dll.dll" /> 37 <include name="System.Data.dll.dll" />
35 <include name="System.Xml.dll" /> 38 <include name="System.Xml.dll" />