OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set up parcel manager and the master avatar in SimpleApp.

afrisby
MW 2007-07-14 14:48:36 +00:00
parent 0bb2b7f18d
commit 5a909a2054
4 changed files with 68 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Examples/SimpleApp/MyWorld.cs
View File

@ -14,7 +14,6 @@ namespace SimpleApp
{ {
public class MyWorld : Scene public class MyWorld : Scene
{ {
private bool firstlogin = true;
private List<ScenePresence> m_avatars; private List<ScenePresence> m_avatars;
public MyWorld(ClientManager clientManager, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer) public MyWorld(ClientManager clientManager, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
@ -58,10 +57,7 @@ namespace SimpleApp
#region IWorld Members #region IWorld Members
override public void AddNewClient(IClientAPI client, bool child) override public void AddNewClient(IClientAPI client, bool child)
{ {
NewLoggin();
LLVector3 pos = new LLVector3(128, 128, 128); LLVector3 pos = new LLVector3(128, 128, 128);
client.OnRegionHandShakeReply += SendLayerData; client.OnRegionHandShakeReply += SendLayerData;
@ -91,9 +87,7 @@ namespace SimpleApp
avatar.Pos = new LLVector3(128, 128, 26); avatar.Pos = new LLVector3(128, 128, 26);
} }
public void NewLoggin() public void CustomStartup()
{
if (firstlogin)
{ {
this.StartTimer(); this.StartTimer();
@ -103,8 +97,6 @@ namespace SimpleApp
shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f); shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
LLVector3 pos1 = new LLVector3(129, 129, 27); LLVector3 pos1 = new LLVector3(129, 129, 27);
AddNewPrim(LLUUID.Random(), pos1, shape); AddNewPrim(LLUUID.Random(), pos1, shape);
firstlogin = false;
}
} }
public override void Update() public override void Update()

25
OpenSim/Region/Examples/SimpleApp/Program.cs
View File

@ -13,6 +13,7 @@ using OpenSim.Region.Capabilities;
using OpenSim.Region.ClientStack; using OpenSim.Region.ClientStack;
using OpenSim.Region.Communications.Local; using OpenSim.Region.Communications.Local;
using OpenSim.Region.GridInterfaces.Local; using OpenSim.Region.GridInterfaces.Local;
using OpenSim.Framework.Data;
namespace SimpleApp namespace SimpleApp
{ {
@ -48,7 +49,7 @@ namespace SimpleApp
UDPServer udpServer = new UDPServer( internalEndPoint.Port, assetCache, inventoryCache, m_log, m_circuitManager ); UDPServer udpServer = new UDPServer( internalEndPoint.Port, assetCache, inventoryCache, m_log, m_circuitManager );
PacketServer packetServer = new PacketServer(udpServer); PacketServer packetServer = new PacketServer(udpServer);
udpServer.ServerListener();
ClientView.TerrainManager = new TerrainManager(new SecondLife()); ClientView.TerrainManager = new TerrainManager(new SecondLife());
BaseHttpServer httpServer = new BaseHttpServer(internalEndPoint.Port); BaseHttpServer httpServer = new BaseHttpServer(internalEndPoint.Port);
@ -62,26 +63,23 @@ namespace SimpleApp
world.PhysScene = physManager.GetPhysicsScene("basicphysics"); //PhysicsScene.Null; world.PhysScene = physManager.GetPhysicsScene("basicphysics"); //PhysicsScene.Null;
world.LoadWorldMap(); world.LoadWorldMap();
world.ParcelManager.NoParcelDataFromStorage();
udpServer.LocalWorld = world; udpServer.LocalWorld = world;
httpServer.Start(); httpServer.Start();
udpServer.ServerListener();
UserProfileData masterAvatar = communicationsManager.UserServer.SetupMasterUser("Test", "User", "test");
if (masterAvatar != null)
{
world.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
world.ParcelManager.NoParcelDataFromStorage();
}
world.CustomStartup();
m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit."); m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");
m_log.ReadLine(); m_log.ReadLine();
/*
PrimitiveBaseShape shape = PrimitiveBaseShape.DefaultBox();
shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
LLVector3 pos = new LLVector3(129,130,25);
world.AddNewPrim( LLUUID.Random(), pos, shape );
*/
} }
private bool AddNewSessionHandler(ulong regionHandle, Login loginData) private bool AddNewSessionHandler(ulong regionHandle, Login loginData)
@ -137,7 +135,6 @@ namespace SimpleApp
Program app = new Program(); Program app = new Program();
app.Run(); app.Run();
} }
} }
} }

1
prebuild.xml
View File

@ -716,6 +716,7 @@
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.UserManagement"/> <Reference name="OpenSim.Framework.UserManagement"/>
<Reference name="OpenSim.Framework.Data"/>
<Reference name="OpenSim.Region.Physics.Manager"/> <Reference name="OpenSim.Region.Physics.Manager"/>
<Reference name="OpenSim.Region.Capabilities"/> <Reference name="OpenSim.Region.Capabilities"/>
<Reference name="XMLRPC.dll"/> <Reference name="XMLRPC.dll"/>