aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--Common/OpenSim.Framework/Interfaces/IClientAPI.cs1
-rw-r--r--OpenSim/OpenSim.Region/World/World.cs9
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.API.cs20
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.cs2
4 files changed, 31 insertions, 1 deletions
diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index d3dc6d2..8a9b598 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -102,6 +102,7 @@ namespace OpenSim.Framework.Interfaces
102 void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort); 102 void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort);
103 AgentCircuitData RequestClientInfo(); 103 AgentCircuitData RequestClientInfo();
104 104
105 void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint);
105 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID); 106 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID);
106 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation); 107 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation);
107 } 108 }
diff --git a/OpenSim/OpenSim.Region/World/World.cs b/OpenSim/OpenSim.Region/World/World.cs
index aad09b3..e316e27 100644
--- a/OpenSim/OpenSim.Region/World/World.cs
+++ b/OpenSim/OpenSim.Region/World/World.cs
@@ -591,6 +591,15 @@ namespace OpenSim.Region
591 591
592 return result; 592 return result;
593 } 593 }
594
595 public Avatar RequestAvatar(LLUUID avatarID)
596 {
597 if (this.Avatars.ContainsKey(avatarID))
598 {
599 return Avatars[avatarID];
600 }
601 return null;
602 }
594 #endregion 603 #endregion
595 604
596 #region ShutDown 605 #region ShutDown
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
index fe46fcb..780035c 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
@@ -425,6 +425,26 @@ namespace OpenSim
425 #region Primitive Packet/data Sending Methods 425 #region Primitive Packet/data Sending Methods
426 426
427 /// <summary> 427 /// <summary>
428 ///
429 /// </summary>
430 /// <param name="localID"></param>
431 /// <param name="rotation"></param>
432 /// <param name="attachPoint"></param>
433 public void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint)
434 {
435 ObjectAttachPacket attach = new ObjectAttachPacket();
436 attach.AgentData.AgentID = this.AgentID;
437 attach.AgentData.SessionID = this.SessionID;
438 attach.AgentData.AttachmentPoint = attachPoint;
439 attach.ObjectData = new ObjectAttachPacket.ObjectDataBlock[1];
440 attach.ObjectData[0] = new ObjectAttachPacket.ObjectDataBlock();
441 attach.ObjectData[0].ObjectLocalID = localID;
442 attach.ObjectData[0].Rotation = rotation;
443
444 this.OutPacket(attach);
445 }
446
447 /// <summary>
428 /// Sends a full ObjectUpdatePacket to a client to inform it of a new primitive 448 /// Sends a full ObjectUpdatePacket to a client to inform it of a new primitive
429 /// or big changes to a existing primitive. 449 /// or big changes to a existing primitive.
430 /// </summary> 450 /// </summary>
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
index 809d3cf..f9a7fe4 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.cs
@@ -69,7 +69,7 @@ namespace OpenSim
69 69
70 private AgentAssetUpload UploadAssets; 70 private AgentAssetUpload UploadAssets;
71 private LLUUID newAssetFolder = LLUUID.Zero; 71 private LLUUID newAssetFolder = LLUUID.Zero;
72 private bool debug = true; 72 private bool debug = false;
73 protected IWorld m_world; 73 protected IWorld m_world;
74 private Dictionary<uint, ClientView> m_clientThreads; 74 private Dictionary<uint, ClientView> m_clientThreads;
75 private AssetCache m_assetCache; 75 private AssetCache m_assetCache;