mirror of
https://github.com/opensim/opensim.git
synced 2026-08-09 02:36:00 +08:00
Fixed SimpleApp - aka thankgoditssundaycommit
* Updated SimpleApp with various introduced dependencies * Extracted ScenePrescence creation in Scene * removed try-catchall from UserManagerBase (that actually hid a bug) * Refactored RegionInfo * handle is calculated * it will explode upon accessing x,y,ip,port,externalip if not explicitly initialized * Removed superfluous 'ref' keywords * Removed a shitload of 'catch Exception e' that causes build warnings * Lots of small refactorings, renames et c * Ignored some bins
This commit is contained in:
@@ -44,7 +44,7 @@ namespace SimpleApp
|
||||
|
||||
#region IWorld Members
|
||||
|
||||
override public void AddNewClient(IClientAPI client, LLUUID agentID, bool child)
|
||||
override public void AddNewClient(IClientAPI client, bool child)
|
||||
|
||||
{
|
||||
LLVector3 pos = new LLVector3(128, 128, 128);
|
||||
@@ -59,7 +59,13 @@ namespace SimpleApp
|
||||
};
|
||||
|
||||
client.OnRequestWearables += SendWearables;
|
||||
|
||||
client.OnAddPrim += AddNewPrim;
|
||||
client.OnUpdatePrimPosition += this.UpdatePrimPosition;
|
||||
client.OnRequestMapBlocks += this.RequestMapBlocks;
|
||||
client.OnTeleportLocationRequest += this.RequestTeleportLocation;
|
||||
client.OnGrapUpdate += this.MoveObject;
|
||||
client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
|
||||
|
||||
client.OnCompleteMovementToRegion += delegate()
|
||||
{
|
||||
client.MoveAgentIntoRegion(m_regionInfo, pos, LLVector3.Zero );
|
||||
@@ -76,7 +82,7 @@ namespace SimpleApp
|
||||
|
||||
client.SendRegionHandshake(m_regionInfo);
|
||||
|
||||
OpenSim.Region.Environment.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo );
|
||||
CreateAndAddScenePresence(client);
|
||||
|
||||
}
|
||||
|
||||
@@ -85,12 +91,6 @@ namespace SimpleApp
|
||||
client.SendWearables( AvatarWearable.DefaultWearables );
|
||||
}
|
||||
|
||||
|
||||
override public void RemoveClient(LLUUID agentID)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public RegionInfo RegionInfo
|
||||
{
|
||||
get { return m_regionInfo; }
|
||||
|
||||
Reference in New Issue
Block a user