aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-04 22:29:37 +0000
committerMelanie Thielker2008-10-04 22:29:37 +0000
commitf52d779550494cdc61b6f3b28c620c5b7d9f0d16 (patch)
tree36f691c09a99e3d53643d6365bb4953a5c2d6da2 /OpenSim/Region
parent* Tidy up configuration stuff, eliminated default setting duplication along t... (diff)
downloadopensim-SC-f52d779550494cdc61b6f3b28c620c5b7d9f0d16.zip
opensim-SC-f52d779550494cdc61b6f3b28c620c5b7d9f0d16.tar.gz
opensim-SC-f52d779550494cdc61b6f3b28c620c5b7d9f0d16.tar.bz2
opensim-SC-f52d779550494cdc61b6f3b28c620c5b7d9f0d16.tar.xz
Plumb packet DirPlacesQuery for search module
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs22
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
3 files changed, 26 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index ef2b2ba..5d7a1ca 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -260,6 +260,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
260 private ActivateGesture handlerActivateGesture = null; 260 private ActivateGesture handlerActivateGesture = null;
261 private DeactivateGesture handlerDeactivateGesture = null; 261 private DeactivateGesture handlerDeactivateGesture = null;
262 262
263 private DirPlacesQuery handlerDirPlacesQuery = null;
264
263 //private TerrainUnacked handlerUnackedTerrain = null; 265 //private TerrainUnacked handlerUnackedTerrain = null;
264 266
265 //** 267 //**
@@ -984,6 +986,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
984 public event ActivateGesture OnActivateGesture; 986 public event ActivateGesture OnActivateGesture;
985 public event DeactivateGesture OnDeactivateGesture; 987 public event DeactivateGesture OnDeactivateGesture;
986 988
989 public event DirPlacesQuery OnDirPlacesQuery;
990
987 991
988 // voire si c'est necessaire 992 // voire si c'est necessaire
989 public void ActivateGesture(UUID assetId, UUID gestureId) 993 public void ActivateGesture(UUID assetId, UUID gestureId)
@@ -6246,6 +6250,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6246 // TODO: handle this packet 6250 // TODO: handle this packet
6247 //m_log.Warn("[CLIENT]: unhandled InventoryDescent packet"); 6251 //m_log.Warn("[CLIENT]: unhandled InventoryDescent packet");
6248 break; 6252 break;
6253 case PacketType.DirPlacesQuery:
6254 DirPlacesQueryPacket dirPlacesQueryPacket = (DirPlacesQueryPacket)Pack;
6255 Console.WriteLine(dirPlacesQueryPacket.ToString());
6256
6257 handlerDirPlacesQuery = OnDirPlacesQuery;
6258 if (handlerDirPlacesQuery != null)
6259 {
6260 handlerDirPlacesQuery(this,
6261 dirPlacesQueryPacket.QueryData.QueryID,
6262 Utils.BytesToString(
6263 dirPlacesQueryPacket.QueryData.QueryText),
6264 (int)dirPlacesQueryPacket.QueryData.QueryFlags,
6265 (int)dirPlacesQueryPacket.QueryData.Category,
6266 Utils.BytesToString(
6267 dirPlacesQueryPacket.QueryData.SimName),
6268 dirPlacesQueryPacket.QueryData.QueryStart);
6269 }
6270 break;
6249 default: 6271 default:
6250 m_log.Warn("[CLIENT]: unhandled packet " + Pack.ToString()); 6272 m_log.Warn("[CLIENT]: unhandled packet " + Pack.ToString());
6251 break; 6273 break;
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index 3d3d41c..c190434 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -322,6 +322,8 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
322 public event ActivateGesture OnActivateGesture; 322 public event ActivateGesture OnActivateGesture;
323 public event DeactivateGesture OnDeactivateGesture; 323 public event DeactivateGesture OnDeactivateGesture;
324 324
325 public event DirPlacesQuery OnDirPlacesQuery;
326
325#pragma warning restore 67 327#pragma warning restore 67
326 328
327 #endregion 329 #endregion
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index c8d542c..1566b2e 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -217,6 +217,8 @@ namespace OpenSim.Region.Examples.SimpleModule
217 public event ActivateGesture OnActivateGesture; 217 public event ActivateGesture OnActivateGesture;
218 public event DeactivateGesture OnDeactivateGesture; 218 public event DeactivateGesture OnDeactivateGesture;
219 219
220 public event DirPlacesQuery OnDirPlacesQuery;
221
220 222
221#pragma warning restore 67 223#pragma warning restore 67
222 224