aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs21
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs2
3 files changed, 25 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 6ac0acd..c12cc69 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -313,6 +313,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
313 313
314 //private AvatarInterestUpdate handlerAvatarInterestUpdate; 314 //private AvatarInterestUpdate handlerAvatarInterestUpdate;
315 315
316 private PlacesQuery handlerPlacesQuery;
317
316 private readonly IGroupsModule m_GroupsModule; 318 private readonly IGroupsModule m_GroupsModule;
317 319
318 //private TerrainUnacked handlerUnackedTerrain = null; 320 //private TerrainUnacked handlerUnackedTerrain = null;
@@ -1112,6 +1114,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1112 1114
1113 //public event AvatarInterestUpdate OnAvatarInterestUpdate; 1115 //public event AvatarInterestUpdate OnAvatarInterestUpdate;
1114 1116
1117 public event PlacesQuery OnPlacesQuery;
1118
1115 public void ActivateGesture(UUID assetId, UUID gestureId) 1119 public void ActivateGesture(UUID assetId, UUID gestureId)
1116 { 1120 {
1117 } 1121 }
@@ -9140,6 +9144,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9140// 9144//
9141// break; 9145// break;
9142 9146
9147 case PacketType.PlacesQuery:
9148 PlacesQueryPacket placesQueryPacket =
9149 (PlacesQueryPacket)Pack;
9150
9151 handlerPlacesQuery = OnPlacesQuery;
9152
9153 if (handlerPlacesQuery != null)
9154 handlerPlacesQuery(placesQueryPacket.AgentData.QueryID,
9155 placesQueryPacket.TransactionData.TransactionID,
9156 Utils.BytesToString(
9157 placesQueryPacket.QueryData.QueryText),
9158 placesQueryPacket.QueryData.QueryFlags,
9159 (byte)placesQueryPacket.QueryData.Category,
9160 Utils.BytesToString(
9161 placesQueryPacket.QueryData.SimName),
9162 this);
9163 break;
9143 default: 9164 default:
9144 m_log.Warn("[CLIENT]: unhandled packet " + Pack); 9165 m_log.Warn("[CLIENT]: unhandled packet " + Pack);
9145 break; 9166 break;
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 34d2ca7..579f09f 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -269,6 +269,8 @@ namespace OpenSim.Region.Examples.SimpleModule
269 269
270 public event AvatarInterestUpdate OnAvatarInterestUpdate; 270 public event AvatarInterestUpdate OnAvatarInterestUpdate;
271 271
272 public event PlacesQuery OnPlacesQuery;
273
272#pragma warning restore 67 274#pragma warning restore 67
273 275
274 private UUID myID = UUID.Random(); 276 private UUID myID = UUID.Random();
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index c721790..abe915c 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -375,6 +375,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
375 375
376 public event AvatarInterestUpdate OnAvatarInterestUpdate; 376 public event AvatarInterestUpdate OnAvatarInterestUpdate;
377 377
378 public event PlacesQuery OnPlacesQuery;
379
378#pragma warning restore 67 380#pragma warning restore 67
379 381
380 #endregion 382 #endregion