aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--Common/OpenSim.Framework/Interfaces/IClientAPI.cs2
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.API.cs14
-rw-r--r--OpenSim/OpenSim.World/Avatar.cs10
-rw-r--r--OpenSim/OpenSim.World/World.cs2
4 files changed, 22 insertions, 6 deletions
diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index e557b6e..06b3075 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -72,5 +72,7 @@ namespace OpenSim.Framework.Interfaces
72 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); 72 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
73 void SendLayerData(float[] map); 73 void SendLayerData(float[] map);
74 void SendRegionHandshake(RegionInfo regionInfo); 74 void SendRegionHandshake(RegionInfo regionInfo);
75 void MoveAgentIntoRegion(RegionInfo regInfo);
76 void SendAvatarData(RegionInfo regionInfo, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos);
75 } 77 }
76} 78}
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
index 7b1e537..4177dff 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
@@ -57,6 +57,20 @@ namespace OpenSim
57 } 57 }
58 58
59 #region World/Avatar to Client 59 #region World/Avatar to Client
60
61 public void MoveAgentIntoRegion(RegionInfo regInfo)
62 {
63 AgentMovementCompletePacket mov = new AgentMovementCompletePacket();
64 mov.AgentData.SessionID = this.SessionID;
65 mov.AgentData.AgentID = this.AgentID;
66 mov.Data.RegionHandle = regInfo.RegionHandle;
67 // TODO - dynamicalise this stuff
68 mov.Data.Timestamp = 1172750370;
69 mov.Data.Position = this.startpos;
70 mov.Data.LookAt = new LLVector3(0.99f, 0.042f, 0);
71
72 OutPacket(mov);
73 }
60 public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID) 74 public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
61 { 75 {
62 System.Text.Encoding enc = System.Text.Encoding.ASCII; 76 System.Text.Encoding enc = System.Text.Encoding.ASCII;
diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs
index 3c22db2..ee5aa44 100644
--- a/OpenSim/OpenSim.World/Avatar.cs
+++ b/OpenSim/OpenSim.World/Avatar.cs
@@ -70,10 +70,10 @@ namespace OpenSim.world
70 /* 70 /*
71 //register for events 71 //register for events
72 ControllingClient.OnRequestWearables += new GenericCall(this.SendOurAppearance); 72 ControllingClient.OnRequestWearables += new GenericCall(this.SendOurAppearance);
73 ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance); 73 ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);*/
74 ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.CompleteMovement); 74 ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.CompleteMovement);
75 ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.SendInitialPosition); 75 ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.SendInitialPosition);
76 ControllingClient.OnAgentUpdate += new GenericCall3(this.HandleAgentUpdate); 76 /* ControllingClient.OnAgentUpdate += new GenericCall3(this.HandleAgentUpdate);
77 ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack); 77 ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);
78 ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange); 78 ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
79 ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement); 79 ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);
@@ -116,7 +116,7 @@ namespace OpenSim.world
116 116
117 public void CompleteMovement() 117 public void CompleteMovement()
118 { 118 {
119 119 this.ControllingClient.MoveAgentIntoRegion(this.regionData);
120 } 120 }
121 121
122 public void HandleAgentUpdate(Packet pack) 122 public void HandleAgentUpdate(Packet pack)
@@ -130,9 +130,9 @@ namespace OpenSim.world
130 } 130 }
131 131
132 //really really should be moved somewhere else (RegionInfo.cs ?) 132 //really really should be moved somewhere else (RegionInfo.cs ?)
133 public void SendRegionHandshake(RegionInfo regionInfo) 133 public void SendRegionHandshake()
134 { 134 {
135 this.ControllingClient.SendRegionHandshake(regionInfo); 135 this.ControllingClient.SendRegionHandshake(this.regionData);
136 } 136 }
137 137
138 public static void LoadAnims() 138 public static void LoadAnims()
diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs
index 8e8ab3e..6a50aaa 100644
--- a/OpenSim/OpenSim.World/World.cs
+++ b/OpenSim/OpenSim.World/World.cs
@@ -513,7 +513,7 @@ namespace OpenSim.world
513 newAvatar = new Avatar(remoteClient, this, m_clientThreads, this.m_regInfo); 513 newAvatar = new Avatar(remoteClient, this, m_clientThreads, this.m_regInfo);
514 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world"); 514 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world");
515 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake "); 515 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake ");
516 newAvatar.SendRegionHandshake(this.m_regInfo); 516 newAvatar.SendRegionHandshake();
517 517
518 PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z); 518 PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
519 lock (this.LockPhysicsEngine) 519 lock (this.LockPhysicsEngine)