aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2009-04-20 20:43:48 +0000
committerMelanie Thielker2009-04-20 20:43:48 +0000
commitd91330ea35a7344af0a3a79e1dac7dee69daee22 (patch)
tree803a687a3e1619e7f8fa865709b9dcd117a9c7d1
parent* It turns out vehicle Angular Motor direction is always in global space. (diff)
downloadopensim-SC_OLD-d91330ea35a7344af0a3a79e1dac7dee69daee22.zip
opensim-SC_OLD-d91330ea35a7344af0a3a79e1dac7dee69daee22.tar.gz
opensim-SC_OLD-d91330ea35a7344af0a3a79e1dac7dee69daee22.tar.bz2
opensim-SC_OLD-d91330ea35a7344af0a3a79e1dac7dee69daee22.tar.xz
Add PlacesQuery packet
Diffstat (limited to '')
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs2
-rw-r--r--OpenSim/Framework/IClientAPI.cs3
-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
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs2
6 files changed, 32 insertions, 0 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index f42b842..52c8072 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -754,6 +754,8 @@ namespace OpenSim.Client.MXP.ClientStack
754 public event MuteListRequest OnMuteListRequest; 754 public event MuteListRequest OnMuteListRequest;
755 public event AvatarInterestUpdate OnAvatarInterestUpdate; 755 public event AvatarInterestUpdate OnAvatarInterestUpdate;
756 756
757 public event PlacesQuery OnPlacesQuery;
758
757 #pragma warning restore 67 759 #pragma warning restore 67
758 760
759 #endregion 761 #endregion
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index da87183..2f9f594 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -442,6 +442,7 @@ namespace OpenSim.Framework
442 public delegate void AvatarNotesUpdate(IClientAPI client, UUID targetID, string notes); 442 public delegate void AvatarNotesUpdate(IClientAPI client, UUID targetID, string notes);
443 public delegate void MuteListRequest(IClientAPI client, uint muteCRC); 443 public delegate void MuteListRequest(IClientAPI client, uint muteCRC);
444 public delegate void AvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages); 444 public delegate void AvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages);
445 public delegate void PlacesQuery(UUID QueryID, UUID TransactionID, string QueryText, uint QueryFlags, byte Category, string SimName, IClientAPI client);
445 446
446 #endregion 447 #endregion
447 448
@@ -782,6 +783,8 @@ namespace OpenSim.Framework
782 event AvatarNotesUpdate OnAvatarNotesUpdate; 783 event AvatarNotesUpdate OnAvatarNotesUpdate;
783 784
784 event MuteListRequest OnMuteListRequest; 785 event MuteListRequest OnMuteListRequest;
786
787 event PlacesQuery OnPlacesQuery;
785 788
786 /// <summary> 789 /// <summary>
787 /// Set the debug level at which packet output should be printed to console. 790 /// Set the debug level at which packet output should be printed to console.
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
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 1efc3fd..a593fe4 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -282,6 +282,8 @@ namespace OpenSim.Tests.Common.Mock
282 282
283 public event AvatarInterestUpdate OnAvatarInterestUpdate; 283 public event AvatarInterestUpdate OnAvatarInterestUpdate;
284 284
285 public event PlacesQuery OnPlacesQuery;
286
285#pragma warning restore 67 287#pragma warning restore 67
286 288
287 /// <value> 289 /// <value>