diff options
author | Melanie | 2009-11-25 08:39:29 +0000 |
---|---|---|
committer | Melanie | 2009-11-25 08:39:29 +0000 |
commit | 4fbdc538c7beb4015eeda12aa3f85440cc7b9690 (patch) | |
tree | 6534a0fbb7ffc3dc800d35801be519ae481f95b5 /OpenSim/Region/ClientStack | |
parent | Add wildcard to prebuild include. Seems each file can only hold one project (diff) | |
parent | * Reverting last commit.. because it just made it worse. (diff) | |
download | opensim-SC-4fbdc538c7beb4015eeda12aa3f85440cc7b9690.zip opensim-SC-4fbdc538c7beb4015eeda12aa3f85440cc7b9690.tar.gz opensim-SC-4fbdc538c7beb4015eeda12aa3f85440cc7b9690.tar.bz2 opensim-SC-4fbdc538c7beb4015eeda12aa3f85440cc7b9690.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 07466e2..4221212 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -8130,8 +8130,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8130 | //lsrp.RequestData.RequestFlags; | 8130 | //lsrp.RequestData.RequestFlags; |
8131 | //lsrp.RequestData.Filter; | 8131 | //lsrp.RequestData.Filter; |
8132 | 8132 | ||
8133 | return true; | 8133 | // return true; |
8134 | } | 8134 | } |
8135 | |||
8135 | private bool HandleRequestRegionInfo(IClientAPI sender, Packet Pack) | 8136 | private bool HandleRequestRegionInfo(IClientAPI sender, Packet Pack) |
8136 | { | 8137 | { |
8137 | RequestRegionInfoPacket.AgentDataBlock mPacket = ((RequestRegionInfoPacket)Pack).AgentData; | 8138 | RequestRegionInfoPacket.AgentDataBlock mPacket = ((RequestRegionInfoPacket)Pack).AgentData; |
@@ -8152,6 +8153,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8152 | } | 8153 | } |
8153 | return true; | 8154 | return true; |
8154 | } | 8155 | } |
8156 | |||
8155 | private bool HandleEstateCovenantRequest(IClientAPI sender, Packet Pack) | 8157 | private bool HandleEstateCovenantRequest(IClientAPI sender, Packet Pack) |
8156 | { | 8158 | { |
8157 | 8159 | ||