aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorDiva Canto2009-08-16 08:59:58 -0700
committerDiva Canto2009-08-16 08:59:58 -0700
commit6808b9109e33a111e3655ae214cd7b80ef3346f4 (patch)
tree02cddcbd4d6676dfc4840863e498943986b19c47 /OpenSim/Region/ClientStack/LindenUDP
parentMerge branch 'master' into inventory-connector (diff)
parent* Implements ISecurityCredential member on SPAvatar, SPAvatarAttachment (diff)
downloadopensim-SC_OLD-6808b9109e33a111e3655ae214cd7b80ef3346f4.zip
opensim-SC_OLD-6808b9109e33a111e3655ae214cd7b80ef3346f4.tar.gz
opensim-SC_OLD-6808b9109e33a111e3655ae214cd7b80ef3346f4.tar.bz2
opensim-SC_OLD-6808b9109e33a111e3655ae214cd7b80ef3346f4.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into inventory-connector
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs25
1 files changed, 25 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 6dda5aa..06bea3d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -197,6 +197,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
197 private ObjectExtraParams handlerUpdateExtraParams; //OnUpdateExtraParams; 197 private ObjectExtraParams handlerUpdateExtraParams; //OnUpdateExtraParams;
198 private ObjectDuplicate handlerObjectDuplicate; 198 private ObjectDuplicate handlerObjectDuplicate;
199 private ObjectDuplicateOnRay handlerObjectDuplicateOnRay; 199 private ObjectDuplicateOnRay handlerObjectDuplicateOnRay;
200 private ObjectRequest handlerObjectRequest;
200 private ObjectSelect handlerObjectSelect; 201 private ObjectSelect handlerObjectSelect;
201 private ObjectDeselect handlerObjectDeselect; 202 private ObjectDeselect handlerObjectDeselect;
202 private ObjectIncludeInSearch handlerObjectIncludeInSearch; 203 private ObjectIncludeInSearch handlerObjectIncludeInSearch;
@@ -1083,6 +1084,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1083 public event GodKickUser OnGodKickUser; 1084 public event GodKickUser OnGodKickUser;
1084 public event ObjectExtraParams OnUpdateExtraParams; 1085 public event ObjectExtraParams OnUpdateExtraParams;
1085 public event UpdateShape OnUpdatePrimShape; 1086 public event UpdateShape OnUpdatePrimShape;
1087 public event ObjectRequest OnObjectRequest;
1086 public event ObjectSelect OnObjectSelect; 1088 public event ObjectSelect OnObjectSelect;
1087 public event ObjectDeselect OnObjectDeselect; 1089 public event ObjectDeselect OnObjectDeselect;
1088 public event GenericCall7 OnObjectDescription; 1090 public event GenericCall7 OnObjectDescription;
@@ -5936,6 +5938,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5936 5938
5937 break; 5939 break;
5938 5940
5941 case PacketType.RequestMultipleObjects:
5942 RequestMultipleObjectsPacket incomingRequest = (RequestMultipleObjectsPacket)Pack;
5943
5944 #region Packet Session and User Check
5945 if (m_checkPackets)
5946 {
5947 if (incomingRequest.AgentData.SessionID != SessionId ||
5948 incomingRequest.AgentData.AgentID != AgentId)
5949 break;
5950 }
5951 #endregion
5952
5953 handlerObjectRequest = null;
5954
5955 for (int i = 0; i < incomingRequest.ObjectData.Length; i++)
5956 {
5957 handlerObjectRequest = OnObjectRequest;
5958 if (handlerObjectRequest != null)
5959 {
5960 handlerObjectRequest(incomingRequest.ObjectData[i].ID, this);
5961 }
5962 }
5963 break;
5939 case PacketType.ObjectSelect: 5964 case PacketType.ObjectSelect:
5940 ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack; 5965 ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack;
5941 5966