aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/world/World.cs
diff options
context:
space:
mode:
authorlbsa712007-04-03 19:12:07 +0000
committerlbsa712007-04-03 19:12:07 +0000
commit7169acc47e8bb56581bd28c3bd921ca9236ba3c3 (patch)
tree4565785736fb759f0c665aac28cd88937042bdd3 /OpenSim.RegionServer/world/World.cs
parentAnother temporary bug fix attempt, this time for the packet overflow problem,... (diff)
downloadopensim-SC_OLD-7169acc47e8bb56581bd28c3bd921ca9236ba3c3.zip
opensim-SC_OLD-7169acc47e8bb56581bd28c3bd921ca9236ba3c3.tar.gz
opensim-SC_OLD-7169acc47e8bb56581bd28c3bd921ca9236ba3c3.tar.bz2
opensim-SC_OLD-7169acc47e8bb56581bd28c3bd921ca9236ba3c3.tar.xz
* Extended Script API with GetRandomAvatar
* The script will now get a IScriptEntity to it's host object with get/sets * The script gets a IScriptReadnlyEntity interface to entities other than the host object. * the test script now follows a random avatar.
Diffstat (limited to 'OpenSim.RegionServer/world/World.cs')
-rw-r--r--OpenSim.RegionServer/world/World.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 408f68d..c775429 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -335,7 +335,7 @@ namespace OpenSim.world
335 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world"); 335 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world");
336 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake "); 336 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake ");
337 NewAvatar.SendRegionHandshake(this); 337 NewAvatar.SendRegionHandshake(this);
338 PhysicsVector pVec = new PhysicsVector(NewAvatar.position.X, NewAvatar.position.Y, NewAvatar.position.Z); 338 PhysicsVector pVec = new PhysicsVector(NewAvatar.Pos.X, NewAvatar.Pos.Y, NewAvatar.Pos.Z);
339 lock (this.LockPhysicsEngine) 339 lock (this.LockPhysicsEngine)
340 { 340 {
341 NewAvatar.PhysActor = this.phyScene.AddAvatar(pVec); 341 NewAvatar.PhysActor = this.phyScene.AddAvatar(pVec);
@@ -348,7 +348,7 @@ namespace OpenSim.world
348 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: AddNewPrim() - Creating new prim"); 348 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: AddNewPrim() - Creating new prim");
349 Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this); 349 Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this);
350 prim.CreateFromPacket(addPacket, AgentClient.AgentID, this._primCount); 350 prim.CreateFromPacket(addPacket, AgentClient.AgentID, this._primCount);
351 PhysicsVector pVec = new PhysicsVector(prim.position.X, prim.position.Y, prim.position.Z); 351 PhysicsVector pVec = new PhysicsVector(prim.Pos.X, prim.Pos.Y, prim.Pos.Z);
352 PhysicsVector pSize = new PhysicsVector(0.255f, 0.255f, 0.255f); 352 PhysicsVector pSize = new PhysicsVector(0.255f, 0.255f, 0.255f);
353 if (OpenSim.world.Avatar.PhysicsEngineFlying) 353 if (OpenSim.world.Avatar.PhysicsEngineFlying)
354 { 354 {
@@ -521,7 +521,7 @@ namespace OpenSim.world
521 reply.ChatData.Message = inchatpack.ChatData.Message; 521 reply.ChatData.Message = inchatpack.ChatData.Message;
522 reply.ChatData.ChatType = 1; 522 reply.ChatData.ChatType = 1;
523 reply.ChatData.SourceType = 1; 523 reply.ChatData.SourceType = 1;
524 reply.ChatData.Position = simClient.ClientAvatar.position; 524 reply.ChatData.Position = simClient.ClientAvatar.Pos;
525 reply.ChatData.FromName = enc.GetBytes(simClient.ClientAvatar.firstname + " " + simClient.ClientAvatar.lastname + "\0"); 525 reply.ChatData.FromName = enc.GetBytes(simClient.ClientAvatar.firstname + " " + simClient.ClientAvatar.lastname + "\0");
526 reply.ChatData.OwnerID = simClient.AgentID; 526 reply.ChatData.OwnerID = simClient.AgentID;
527 reply.ChatData.SourceID = simClient.AgentID; 527 reply.ChatData.SourceID = simClient.AgentID;