diff options
author | lbsa71 | 2007-09-19 04:19:27 +0000 |
---|---|---|
committer | lbsa71 | 2007-09-19 04:19:27 +0000 |
commit | 2afbf8b22b1548c7994981acf92882c6d9628bb9 (patch) | |
tree | aae0d8494f800b7d23748069f108e606358cd5d1 /OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | |
parent | * Deleted unused RegionManager.cs (diff) | |
download | opensim-SC_OLD-2afbf8b22b1548c7994981acf92882c6d9628bb9.zip opensim-SC_OLD-2afbf8b22b1548c7994981acf92882c6d9628bb9.tar.gz opensim-SC_OLD-2afbf8b22b1548c7994981acf92882c6d9628bb9.tar.bz2 opensim-SC_OLD-2afbf8b22b1548c7994981acf92882c6d9628bb9.tar.xz |
* Added AddToPhysicalScene and RemoveFromPhysicalScene and added to MakeAvatar and MakeChildAgent respectively
* Removed unused m_child from ClientView
Diffstat (limited to 'OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs index 3bb7c03..61fc498 100644 --- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs +++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | |||
@@ -175,18 +175,15 @@ namespace OpenSim.Region.ClientStack | |||
175 | } | 175 | } |
176 | break; | 176 | break; |
177 | case PacketType.AgentAnimation: | 177 | case PacketType.AgentAnimation: |
178 | if (!m_child) | 178 | AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack; |
179 | for (int i = 0; i < AgentAni.AnimationList.Length; i++) | ||
179 | { | 180 | { |
180 | AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack; | 181 | if (AgentAni.AnimationList[i].StartAnim) |
181 | for (int i = 0; i < AgentAni.AnimationList.Length; i++) | ||
182 | { | 182 | { |
183 | if (AgentAni.AnimationList[i].StartAnim) | ||
184 | { | ||
185 | 183 | ||
186 | if (OnStartAnim != null) | 184 | if (OnStartAnim != null) |
187 | { | 185 | { |
188 | OnStartAnim(this, AgentAni.AnimationList[i].AnimID, 1); | 186 | OnStartAnim(this, AgentAni.AnimationList[i].AnimID, 1); |
189 | } | ||
190 | } | 187 | } |
191 | } | 188 | } |
192 | } | 189 | } |
@@ -352,8 +349,8 @@ namespace OpenSim.Region.ClientStack | |||
352 | break; | 349 | break; |
353 | case PacketType.AssetUploadRequest: | 350 | case PacketType.AssetUploadRequest: |
354 | AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack; | 351 | AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack; |
355 | // Console.WriteLine("upload request " + Pack.ToString()); | 352 | // Console.WriteLine("upload request " + Pack.ToString()); |
356 | // Console.WriteLine("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionID).ToStringHyphenated()); | 353 | // Console.WriteLine("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionID).ToStringHyphenated()); |
357 | if (OnAssetUploadRequest != null) | 354 | if (OnAssetUploadRequest != null) |
358 | { | 355 | { |
359 | OnAssetUploadRequest(this, request.AssetBlock.TransactionID.Combine(this.SecureSessionID), request.AssetBlock.TransactionID, request.AssetBlock.Type, request.AssetBlock.AssetData, request.AssetBlock.StoreLocal); | 356 | OnAssetUploadRequest(this, request.AssetBlock.TransactionID.Combine(this.SecureSessionID), request.AssetBlock.TransactionID, request.AssetBlock.Type, request.AssetBlock.AssetData, request.AssetBlock.StoreLocal); |