aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie2009-11-25 08:45:41 +0000
committerMelanie2009-11-25 08:45:41 +0000
commit25b4160434f7c72bae7827deec948574e9664364 (patch)
tree5fc3297ddc1adce47af65cda0aa46734bd1a2c17 /OpenSim/Region/ClientStack
parentAppend a prefix to the god avatar names appearing in chat whilst in god mode ... (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-25b4160434f7c72bae7827deec948574e9664364.zip
opensim-SC_OLD-25b4160434f7c72bae7827deec948574e9664364.tar.gz
opensim-SC_OLD-25b4160434f7c72bae7827deec948574e9664364.tar.bz2
opensim-SC_OLD-25b4160434f7c72bae7827deec948574e9664364.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index a8206dc..ac16b02 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -8113,8 +8113,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
8113 //lsrp.RequestData.RequestFlags; 8113 //lsrp.RequestData.RequestFlags;
8114 //lsrp.RequestData.Filter; 8114 //lsrp.RequestData.Filter;
8115 8115
8116 return true; 8116// return true;
8117 } 8117 }
8118
8118 private bool HandleRequestRegionInfo(IClientAPI sender, Packet Pack) 8119 private bool HandleRequestRegionInfo(IClientAPI sender, Packet Pack)
8119 { 8120 {
8120 RequestRegionInfoPacket.AgentDataBlock mPacket = ((RequestRegionInfoPacket)Pack).AgentData; 8121 RequestRegionInfoPacket.AgentDataBlock mPacket = ((RequestRegionInfoPacket)Pack).AgentData;
@@ -8135,6 +8136,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
8135 } 8136 }
8136 return true; 8137 return true;
8137 } 8138 }
8139
8138 private bool HandleEstateCovenantRequest(IClientAPI sender, Packet Pack) 8140 private bool HandleEstateCovenantRequest(IClientAPI sender, Packet Pack)
8139 { 8141 {
8140 8142