* Removed ClientThreads from avatar

* Deleted SimpleApp2 as it's getting wonkier and wonkier by the minute
* Added avatar handling to SimpleApp, still don't have any avatar out on the playing field
* Removed some warnings
* Went from IWorld to Scene
* 

1 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Examples/SimpleApp/Program.cs b/OpenSim/Examples/SimpleApp/Program.cs
index 1d0702d..b0b68d9 100644
--- a/OpenSim/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Examples/SimpleApp/Program.cs
@@ -12,6 +12,8 @@ using OpenSim.UserServer;
 using OpenSim.Servers;

 using OpenSim.Framework;

 using OpenSim.Caches;

+using OpenGrid.Framework.Communications;

+using OpenSim.LocalCommunications;

 

 namespace SimpleApp

 {

@@ -51,9 +53,11 @@ namespace SimpleApp
             

             ClientView.TerrainManager = new TerrainManager(new SecondLife());

 

-            RegionInfo regionInfo = new RegionInfo();

+            CommunicationsManager communicationsManager = new CommunicationsLocal();

+            

+            RegionInfo regionInfo = new RegionInfo( );

 

-            udpServer.LocalWorld = new MyWorld( regionInfo );

+            udpServer.LocalWorld = new MyWorld( packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache );

 

             // World world = new World(udpServer.PacketServer.ClientAPIs, regionInfo);            

             // PhysicsScene physicsScene = new NullPhysicsScene();