aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-15 20:32:49 +0000
committerJustin Clarke Casey2008-12-15 20:32:49 +0000
commit41ad030a5aacaf0b0d43d08df2ff331368f88936 (patch)
tree0a03960e8bb6596e168a01d3d82727248cabbd1d /OpenSim/Region/ClientStack/LindenUDP
parent* Apply http://opensimulator.org/mantis/view.php?id=2775 with small tweaks (diff)
downloadopensim-SC_OLD-41ad030a5aacaf0b0d43d08df2ff331368f88936.zip
opensim-SC_OLD-41ad030a5aacaf0b0d43d08df2ff331368f88936.tar.gz
opensim-SC_OLD-41ad030a5aacaf0b0d43d08df2ff331368f88936.tar.bz2
opensim-SC_OLD-41ad030a5aacaf0b0d43d08df2ff331368f88936.tar.xz
* minor: method documentation and miscellaneous tidy
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs21
1 files changed, 13 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 8b20946..9fb3c55 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1021,14 +1021,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1021 public void ActivateGesture(UUID assetId, UUID gestureId) 1021 public void ActivateGesture(UUID assetId, UUID gestureId)
1022 { 1022 {
1023 } 1023 }
1024
1024 public void DeactivateGesture(UUID assetId, UUID gestureId) 1025 public void DeactivateGesture(UUID assetId, UUID gestureId)
1025 { 1026 {
1026 } 1027 }
1027 1028
1028 // Sound 1029 // Sound
1029 public void SoundTrigger(UUID soundId, UUID owerid, UUID Objectid,UUID ParentId,float Gain, Vector3 Position,UInt64 Handle) 1030 public void SoundTrigger(UUID soundId, UUID owerid, UUID Objectid,UUID ParentId,float Gain, Vector3 Position,UInt64 Handle)
1030 { 1031 {
1031
1032 } 1032 }
1033 1033
1034 #region Scene/Avatar to Client 1034 #region Scene/Avatar to Client
@@ -2801,11 +2801,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2801 OutPacket(objPropFamilyPack, ThrottleOutPacketType.Task); 2801 OutPacket(objPropFamilyPack, ThrottleOutPacketType.Task);
2802 } 2802 }
2803 2803
2804 public void SendObjectPropertiesReply(UUID ItemID, ulong CreationDate, UUID CreatorUUID, UUID FolderUUID, UUID FromTaskUUID, 2804 public void SendObjectPropertiesReply(
2805 UUID GroupUUID, short InventorySerial, UUID LastOwnerUUID, UUID ObjectUUID, 2805 UUID ItemID, ulong CreationDate, UUID CreatorUUID, UUID FolderUUID, UUID FromTaskUUID,
2806 UUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName, 2806 UUID GroupUUID, short InventorySerial, UUID LastOwnerUUID, UUID ObjectUUID,
2807 string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask, uint EveryoneMask, 2807 UUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName,
2808 uint BaseMask, byte saleType, int salePrice) 2808 string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask, uint EveryoneMask,
2809 uint BaseMask, byte saleType, int salePrice)
2809 { 2810 {
2810 ObjectPropertiesPacket proper = (ObjectPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ObjectProperties); 2811 ObjectPropertiesPacket proper = (ObjectPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ObjectProperties);
2811 // TODO: don't create new blocks if recycling an old packet 2812 // TODO: don't create new blocks if recycling an old packet
@@ -4139,6 +4140,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4139 //there is a handler registered that handled this packet type 4140 //there is a handler registered that handled this packet type
4140 return; 4141 return;
4141 } 4142 }
4143
4142 // Main packet processing conditional 4144 // Main packet processing conditional
4143 switch (Pack.Type) 4145 switch (Pack.Type)
4144 { 4146 {
@@ -4160,6 +4162,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4160 } 4162 }
4161 4163
4162 break; 4164 break;
4165
4163 case PacketType.ChatFromViewer: 4166 case PacketType.ChatFromViewer:
4164 ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack; 4167 ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;
4165 4168
@@ -4188,6 +4191,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4188 handlerChatFromClient(this, args); 4191 handlerChatFromClient(this, args);
4189 } 4192 }
4190 break; 4193 break;
4194
4191 case PacketType.AvatarPropertiesUpdate: 4195 case PacketType.AvatarPropertiesUpdate:
4192 AvatarPropertiesUpdatePacket Packet = (AvatarPropertiesUpdatePacket)Pack; 4196 AvatarPropertiesUpdatePacket Packet = (AvatarPropertiesUpdatePacket)Pack;
4193 4197
@@ -4226,6 +4230,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4226 } 4230 }
4227 4231
4228 break; 4232 break;
4233
4229 case PacketType.ImprovedInstantMessage: 4234 case PacketType.ImprovedInstantMessage:
4230 ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket)Pack; 4235 ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket)Pack;
4231 string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName); 4236 string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName);
@@ -4309,7 +4314,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4309 } 4314 }
4310 break; 4315 break;
4311 4316
4312 case PacketType.DeRezObject: 4317 case PacketType.DeRezObject:
4313 DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) Pack; 4318 DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) Pack;
4314 handlerDeRezObject = OnDeRezObject; 4319 handlerDeRezObject = OnDeRezObject;
4315 if (handlerDeRezObject != null) 4320 if (handlerDeRezObject != null)