Added AttachObject method to IClientAPI.
Added RequestAvatar(LLUUID avatarID) method to world.Sugilite
parent
d93031b2dc
commit
ed80c7ae32
|
@ -102,6 +102,7 @@ namespace OpenSim.Framework.Interfaces
|
||||||
void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort);
|
void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort);
|
||||||
AgentCircuitData RequestClientInfo();
|
AgentCircuitData RequestClientInfo();
|
||||||
|
|
||||||
|
void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint);
|
||||||
void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID);
|
void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID);
|
||||||
void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation);
|
void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation);
|
||||||
}
|
}
|
||||||
|
|
|
@ -591,6 +591,15 @@ namespace OpenSim.Region
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Avatar RequestAvatar(LLUUID avatarID)
|
||||||
|
{
|
||||||
|
if (this.Avatars.ContainsKey(avatarID))
|
||||||
|
{
|
||||||
|
return Avatars[avatarID];
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region ShutDown
|
#region ShutDown
|
||||||
|
|
|
@ -424,6 +424,26 @@ namespace OpenSim
|
||||||
|
|
||||||
#region Primitive Packet/data Sending Methods
|
#region Primitive Packet/data Sending Methods
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="localID"></param>
|
||||||
|
/// <param name="rotation"></param>
|
||||||
|
/// <param name="attachPoint"></param>
|
||||||
|
public void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint)
|
||||||
|
{
|
||||||
|
ObjectAttachPacket attach = new ObjectAttachPacket();
|
||||||
|
attach.AgentData.AgentID = this.AgentID;
|
||||||
|
attach.AgentData.SessionID = this.SessionID;
|
||||||
|
attach.AgentData.AttachmentPoint = attachPoint;
|
||||||
|
attach.ObjectData = new ObjectAttachPacket.ObjectDataBlock[1];
|
||||||
|
attach.ObjectData[0] = new ObjectAttachPacket.ObjectDataBlock();
|
||||||
|
attach.ObjectData[0].ObjectLocalID = localID;
|
||||||
|
attach.ObjectData[0].Rotation = rotation;
|
||||||
|
|
||||||
|
this.OutPacket(attach);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Sends a full ObjectUpdatePacket to a client to inform it of a new primitive
|
/// Sends a full ObjectUpdatePacket to a client to inform it of a new primitive
|
||||||
/// or big changes to a existing primitive.
|
/// or big changes to a existing primitive.
|
||||||
|
|
|
@ -69,7 +69,7 @@ namespace OpenSim
|
||||||
|
|
||||||
private AgentAssetUpload UploadAssets;
|
private AgentAssetUpload UploadAssets;
|
||||||
private LLUUID newAssetFolder = LLUUID.Zero;
|
private LLUUID newAssetFolder = LLUUID.Zero;
|
||||||
private bool debug = true;
|
private bool debug = false;
|
||||||
protected IWorld m_world;
|
protected IWorld m_world;
|
||||||
private Dictionary<uint, ClientView> m_clientThreads;
|
private Dictionary<uint, ClientView> m_clientThreads;
|
||||||
private AssetCache m_assetCache;
|
private AssetCache m_assetCache;
|
||||||
|
|
Loading…
Reference in New Issue