diff options
author | Teravus Ovares | 2007-12-18 12:08:34 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-12-18 12:08:34 +0000 |
commit | ccc8ffaaec915f0561d9aded6cc4b32b911f473c (patch) | |
tree | e07135474e1986cd09177db8e62787b4f74c114a /OpenSim/Region/ClientStack/ClientView.cs | |
parent | * Removed redundant code in RestService.cs (diff) | |
download | opensim-SC-ccc8ffaaec915f0561d9aded6cc4b32b911f473c.zip opensim-SC-ccc8ffaaec915f0561d9aded6cc4b32b911f473c.tar.gz opensim-SC-ccc8ffaaec915f0561d9aded6cc4b32b911f473c.tar.bz2 opensim-SC-ccc8ffaaec915f0561d9aded6cc4b32b911f473c.tar.xz |
* Added Incomplete Handling of the RegionInfoRequest packet
* Added Incomplete Handling of the EstateCovenantRequest packet
* Added Incomplete Handling of the EstateOwnerMessageRequest.ChangeEstateCovenantid method
* Fixed a race condition with avatar animations
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index df52745..3c35270 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -529,6 +529,9 @@ namespace OpenSim.Region.ClientStack | |||
529 | public event ParcelSelectObjects OnParcelSelectObjects; | 529 | public event ParcelSelectObjects OnParcelSelectObjects; |
530 | public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest; | 530 | public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest; |
531 | public event EstateOwnerMessageRequest OnEstateOwnerMessage; | 531 | public event EstateOwnerMessageRequest OnEstateOwnerMessage; |
532 | public event RegionInfoRequest OnRegionInfoRequest; | ||
533 | public event EstateCovenantRequest OnEstateCovenantRequest; | ||
534 | |||
532 | 535 | ||
533 | #region Scene/Avatar to Client | 536 | #region Scene/Avatar to Client |
534 | 537 | ||
@@ -3216,7 +3219,21 @@ namespace OpenSim.Region.ClientStack | |||
3216 | OnEstateOwnerMessage(messagePacket, this); | 3219 | OnEstateOwnerMessage(messagePacket, this); |
3217 | } | 3220 | } |
3218 | break; | 3221 | break; |
3219 | 3222 | case PacketType.RequestRegionInfo: | |
3223 | RequestRegionInfoPacket.AgentDataBlock mPacket = ((RequestRegionInfoPacket)Pack).AgentData; | ||
3224 | if (OnRegionInfoRequest != null) | ||
3225 | { | ||
3226 | OnRegionInfoRequest(this, mPacket.SessionID); | ||
3227 | } | ||
3228 | break; | ||
3229 | case PacketType.EstateCovenantRequest: | ||
3230 | // TODO: handle this packet | ||
3231 | EstateCovenantRequestPacket.AgentDataBlock epack = ((EstateCovenantRequestPacket)Pack).AgentData; | ||
3232 | if (OnEstateCovenantRequest != null) | ||
3233 | { | ||
3234 | OnEstateCovenantRequest(this, epack.SessionID); | ||
3235 | } | ||
3236 | break; | ||
3220 | case PacketType.AgentThrottle: | 3237 | case PacketType.AgentThrottle: |
3221 | AgentThrottlePacket atpack = (AgentThrottlePacket)Pack; | 3238 | AgentThrottlePacket atpack = (AgentThrottlePacket)Pack; |
3222 | m_packetQueue.SetThrottleFromClient(atpack.Throttle.Throttles); | 3239 | m_packetQueue.SetThrottleFromClient(atpack.Throttle.Throttles); |
@@ -3278,10 +3295,7 @@ namespace OpenSim.Region.ClientStack | |||
3278 | // TODO: handle this packet | 3295 | // TODO: handle this packet |
3279 | MainLog.Instance.Warn("CLIENT", "unhandled ViewerStats packet"); | 3296 | MainLog.Instance.Warn("CLIENT", "unhandled ViewerStats packet"); |
3280 | break; | 3297 | break; |
3281 | case PacketType.EstateCovenantRequest: | 3298 | |
3282 | // TODO: handle this packet | ||
3283 | MainLog.Instance.Warn("CLIENT", "unhandled EstateCovenantRequest packet"); | ||
3284 | break; | ||
3285 | case PacketType.CreateGroupRequest: | 3299 | case PacketType.CreateGroupRequest: |
3286 | // TODO: handle this packet | 3300 | // TODO: handle this packet |
3287 | MainLog.Instance.Warn("CLIENT", "unhandled CreateGroupRequest packet"); | 3301 | MainLog.Instance.Warn("CLIENT", "unhandled CreateGroupRequest packet"); |
@@ -3343,10 +3357,6 @@ namespace OpenSim.Region.ClientStack | |||
3343 | // TODO: handle this packet | 3357 | // TODO: handle this packet |
3344 | MainLog.Instance.Warn("CLIENT", "unhandled UserInfoRequest packet"); | 3358 | MainLog.Instance.Warn("CLIENT", "unhandled UserInfoRequest packet"); |
3345 | break; | 3359 | break; |
3346 | case PacketType.RequestRegionInfo: | ||
3347 | // TODO: handle this packet | ||
3348 | MainLog.Instance.Warn("CLIENT", "unhandled RequestRegionInfo packet"); | ||
3349 | break; | ||
3350 | case PacketType.InventoryDescendents: | 3360 | case PacketType.InventoryDescendents: |
3351 | // TODO: handle this packet | 3361 | // TODO: handle this packet |
3352 | MainLog.Instance.Warn("CLIENT", "unhandled InventoryDescent packet"); | 3362 | MainLog.Instance.Warn("CLIENT", "unhandled InventoryDescent packet"); |