OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some small changes

afrisby
MW 2007-10-31 09:18:24 +00:00
parent f42afe81af
commit a9ad16b13a
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/IClientAPI.cs
View File

@ -367,7 +367,7 @@ namespace OpenSim.Framework
uint CircuitCode { get; set; } uint CircuitCode { get; set; }
void OutPacket(Packet newPack); void OutPacket(Packet newPack);
void SendWearables(AvatarWearable[] wearables); void SendWearables(AvatarWearable[] wearables, int serial);
void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry); void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry);
void SendStartPingCheck(byte seq); void SendStartPingCheck(byte seq);
void SendKillObject(ulong regionHandle, uint localID); void SendKillObject(ulong regionHandle, uint localID);

4
OpenSim/Region/ClientStack/ClientView.API.cs
View File

@ -843,11 +843,11 @@ namespace OpenSim.Region.ClientStack
/// ///
/// </summary> /// </summary>
/// <param name="wearables"></param> /// <param name="wearables"></param>
public void SendWearables(AvatarWearable[] wearables) public void SendWearables(AvatarWearable[] wearables, int serial)
{ {
AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket(); AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket();
aw.AgentData.AgentID = AgentId; aw.AgentData.AgentID = AgentId;
aw.AgentData.SerialNum = 0; aw.AgentData.SerialNum = (uint)serial;
aw.AgentData.SessionID = m_sessionId; aw.AgentData.SessionID = m_sessionId;
aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13]; aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13];

2
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -203,7 +203,7 @@ namespace OpenSim.Region.ClientStack
{ {
if (debug > 0) if (debug > 0)
{ {
string info; string info= "";
if (debug < 255 && packet.Type == PacketType.AgentUpdate) if (debug < 255 && packet.Type == PacketType.AgentUpdate)
return; return;
if (debug < 254 && packet.Type == PacketType.ViewerEffect) if (debug < 254 && packet.Type == PacketType.ViewerEffect)

13
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -69,6 +69,7 @@ namespace OpenSim.Region.Environment.Scenes
private readonly Vector3[] Dir_Vectors = new Vector3[6]; private readonly Vector3[] Dir_Vectors = new Vector3[6];
private LLVector3 lastPhysPos = new LLVector3(); private LLVector3 lastPhysPos = new LLVector3();
private int m_wearablesSerial = 1;
private enum Dir_ControlFlags private enum Dir_ControlFlags
{ {
@ -825,7 +826,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="client"></param> /// <param name="client"></param>
public void SendOurAppearance(IClientAPI client) public void SendOurAppearance(IClientAPI client)
{ {
client.SendWearables(m_wearables); client.SendWearables(m_wearables, m_wearablesSerial++);
//this.SendFullUpdateToAllClients(); //this.SendFullUpdateToAllClients();
//this.SendAppearanceToAllOtherAgents(); //this.SendAppearanceToAllOtherAgents();
@ -851,10 +852,10 @@ namespace OpenSim.Region.Environment.Scenes
{ {
m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
{ {
if (scenePresence != this) // if (scenePresence != this)
{ // {
SendAppearanceToOtherAgent(scenePresence); SendAppearanceToOtherAgent(scenePresence);
} // }
}); });
} }
@ -1087,7 +1088,7 @@ namespace OpenSim.Region.Environment.Scenes
public void SetWearable(int wearableId, AvatarWearable wearable) public void SetWearable(int wearableId, AvatarWearable wearable)
{ {
m_wearables[wearableId] = wearable; m_wearables[wearableId] = wearable;
SendOurAppearance(m_controllingClient); m_controllingClient.SendWearables(m_wearables, m_wearablesSerial++);
} }
} }
} }

3
OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
View File

@ -161,11 +161,12 @@ namespace SimpleApp
get { return lastName; } get { return lastName; }
} }
public virtual void OutPacket(Packet newPack) public virtual void OutPacket(Packet newPack)
{ {
} }
public virtual void SendWearables(AvatarWearable[] wearables) public virtual void SendWearables(AvatarWearable[] wearables, int serial)
{ {
} }