diff options
author | MW | 2007-10-31 09:18:24 +0000 |
---|---|---|
committer | MW | 2007-10-31 09:18:24 +0000 |
commit | a9ad16b13acb0865b379e81c86d32eb44d277c56 (patch) | |
tree | e1a8c9aa8fccbd9e8c3114b4e7ca162bee83b7c3 /OpenSim/Region | |
parent | added .dat extension to dumped asset files (diff) | |
download | opensim-SC_OLD-a9ad16b13acb0865b379e81c86d32eb44d277c56.zip opensim-SC_OLD-a9ad16b13acb0865b379e81c86d32eb44d277c56.tar.gz opensim-SC_OLD-a9ad16b13acb0865b379e81c86d32eb44d277c56.tar.bz2 opensim-SC_OLD-a9ad16b13acb0865b379e81c86d32eb44d277c56.tar.xz |
some small changes
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.API.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 13 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs | 3 |
4 files changed, 12 insertions, 10 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs index 28d8513..1597cc5 100644 --- a/OpenSim/Region/ClientStack/ClientView.API.cs +++ b/OpenSim/Region/ClientStack/ClientView.API.cs | |||
@@ -843,11 +843,11 @@ namespace OpenSim.Region.ClientStack | |||
843 | /// | 843 | /// |
844 | /// </summary> | 844 | /// </summary> |
845 | /// <param name="wearables"></param> | 845 | /// <param name="wearables"></param> |
846 | public void SendWearables(AvatarWearable[] wearables) | 846 | public void SendWearables(AvatarWearable[] wearables, int serial) |
847 | { | 847 | { |
848 | AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket(); | 848 | AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket(); |
849 | aw.AgentData.AgentID = AgentId; | 849 | aw.AgentData.AgentID = AgentId; |
850 | aw.AgentData.SerialNum = 0; | 850 | aw.AgentData.SerialNum = (uint)serial; |
851 | aw.AgentData.SessionID = m_sessionId; | 851 | aw.AgentData.SessionID = m_sessionId; |
852 | 852 | ||
853 | aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13]; | 853 | aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13]; |
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 55f50a4..730c199 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -203,7 +203,7 @@ namespace OpenSim.Region.ClientStack | |||
203 | { | 203 | { |
204 | if (debug > 0) | 204 | if (debug > 0) |
205 | { | 205 | { |
206 | string info; | 206 | string info= ""; |
207 | if (debug < 255 && packet.Type == PacketType.AgentUpdate) | 207 | if (debug < 255 && packet.Type == PacketType.AgentUpdate) |
208 | return; | 208 | return; |
209 | if (debug < 254 && packet.Type == PacketType.ViewerEffect) | 209 | if (debug < 254 && packet.Type == PacketType.ViewerEffect) |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 56c1401..8d326cf 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -69,6 +69,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
69 | 69 | ||
70 | private readonly Vector3[] Dir_Vectors = new Vector3[6]; | 70 | private readonly Vector3[] Dir_Vectors = new Vector3[6]; |
71 | private LLVector3 lastPhysPos = new LLVector3(); | 71 | private LLVector3 lastPhysPos = new LLVector3(); |
72 | private int m_wearablesSerial = 1; | ||
72 | 73 | ||
73 | private enum Dir_ControlFlags | 74 | private enum Dir_ControlFlags |
74 | { | 75 | { |
@@ -825,7 +826,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
825 | /// <param name="client"></param> | 826 | /// <param name="client"></param> |
826 | public void SendOurAppearance(IClientAPI client) | 827 | public void SendOurAppearance(IClientAPI client) |
827 | { | 828 | { |
828 | client.SendWearables(m_wearables); | 829 | client.SendWearables(m_wearables, m_wearablesSerial++); |
829 | 830 | ||
830 | //this.SendFullUpdateToAllClients(); | 831 | //this.SendFullUpdateToAllClients(); |
831 | //this.SendAppearanceToAllOtherAgents(); | 832 | //this.SendAppearanceToAllOtherAgents(); |
@@ -851,10 +852,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
851 | { | 852 | { |
852 | m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) | 853 | m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) |
853 | { | 854 | { |
854 | if (scenePresence != this) | 855 | // if (scenePresence != this) |
855 | { | 856 | // { |
856 | SendAppearanceToOtherAgent(scenePresence); | 857 | SendAppearanceToOtherAgent(scenePresence); |
857 | } | 858 | // } |
858 | }); | 859 | }); |
859 | } | 860 | } |
860 | 861 | ||
@@ -1087,7 +1088,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1087 | public void SetWearable(int wearableId, AvatarWearable wearable) | 1088 | public void SetWearable(int wearableId, AvatarWearable wearable) |
1088 | { | 1089 | { |
1089 | m_wearables[wearableId] = wearable; | 1090 | m_wearables[wearableId] = wearable; |
1090 | SendOurAppearance(m_controllingClient); | 1091 | m_controllingClient.SendWearables(m_wearables, m_wearablesSerial++); |
1091 | } | 1092 | } |
1092 | } | 1093 | } |
1093 | } | 1094 | } |
diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs index f7fdbb5..9ed1f35 100644 --- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs | |||
@@ -161,11 +161,12 @@ namespace SimpleApp | |||
161 | get { return lastName; } | 161 | get { return lastName; } |
162 | } | 162 | } |
163 | 163 | ||
164 | |||
164 | public virtual void OutPacket(Packet newPack) | 165 | public virtual void OutPacket(Packet newPack) |
165 | { | 166 | { |
166 | } | 167 | } |
167 | 168 | ||
168 | public virtual void SendWearables(AvatarWearable[] wearables) | 169 | public virtual void SendWearables(AvatarWearable[] wearables, int serial) |
169 | { | 170 | { |
170 | } | 171 | } |
171 | 172 | ||