aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/ClientView.API.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/ClientView.API.cs')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs53
1 files changed, 23 insertions, 30 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index c97ba37..9d5a9e8 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -124,19 +124,12 @@ namespace OpenSim.Region.ClientStack
124 /// <summary> 124 /// <summary>
125 /// 125 ///
126 /// </summary> 126 /// </summary>
127 private LLUUID m_agentId;
127 public LLUUID AgentId 128 public LLUUID AgentId
128 { 129 {
129 get 130 get
130 { 131 {
131 return this.AgentID; 132 return m_agentId;
132 }
133 }
134
135 public LLUUID SessionId
136 {
137 get
138 {
139 return this.SessionID;
140 } 133 }
141 } 134 }
142 135
@@ -212,8 +205,8 @@ namespace OpenSim.Region.ClientStack
212 public void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look) 205 public void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look)
213 { 206 {
214 AgentMovementCompletePacket mov = new AgentMovementCompletePacket(); 207 AgentMovementCompletePacket mov = new AgentMovementCompletePacket();
215 mov.AgentData.SessionID = this.SessionID; 208 mov.AgentData.SessionID = this.m_sessionId;
216 mov.AgentData.AgentID = this.AgentID; 209 mov.AgentData.AgentID = this.AgentId;
217 mov.Data.RegionHandle = regInfo.RegionHandle; 210 mov.Data.RegionHandle = regInfo.RegionHandle;
218 mov.Data.Timestamp = 1172750370; // TODO - dynamicalise this 211 mov.Data.Timestamp = 1172750370; // TODO - dynamicalise this
219 212
@@ -377,7 +370,7 @@ namespace OpenSim.Region.ClientStack
377 { 370 {
378 AgentCircuitData agentData = new AgentCircuitData(); 371 AgentCircuitData agentData = new AgentCircuitData();
379 agentData.AgentID = this.AgentId; 372 agentData.AgentID = this.AgentId;
380 agentData.SessionID = this.SessionID; 373 agentData.SessionID = this.m_sessionId;
381 agentData.SecureSessionID = this.SecureSessionID; 374 agentData.SecureSessionID = this.SecureSessionID;
382 agentData.circuitcode = this.CircuitCode; 375 agentData.circuitcode = this.CircuitCode;
383 agentData.child = false; 376 agentData.child = false;
@@ -393,8 +386,8 @@ namespace OpenSim.Region.ClientStack
393 386
394 CrossedRegionPacket newSimPack = new CrossedRegionPacket(); 387 CrossedRegionPacket newSimPack = new CrossedRegionPacket();
395 newSimPack.AgentData = new CrossedRegionPacket.AgentDataBlock(); 388 newSimPack.AgentData = new CrossedRegionPacket.AgentDataBlock();
396 newSimPack.AgentData.AgentID = this.AgentID; 389 newSimPack.AgentData.AgentID = this.AgentId;
397 newSimPack.AgentData.SessionID = this.SessionID; 390 newSimPack.AgentData.SessionID = this.m_sessionId;
398 newSimPack.Info = new CrossedRegionPacket.InfoBlock(); 391 newSimPack.Info = new CrossedRegionPacket.InfoBlock();
399 newSimPack.Info.Position = pos; 392 newSimPack.Info.Position = pos;
400 newSimPack.Info.LookAt = look; // new LLVector3(0.0f, 0.0f, 0.0f); // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!! 393 newSimPack.Info.LookAt = look; // new LLVector3(0.0f, 0.0f, 0.0f); // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!!
@@ -415,7 +408,7 @@ namespace OpenSim.Region.ClientStack
415 public void SendMapBlock(List<MapBlockData> mapBlocks) 408 public void SendMapBlock(List<MapBlockData> mapBlocks)
416 { 409 {
417 MapBlockReplyPacket mapReply = new MapBlockReplyPacket(); 410 MapBlockReplyPacket mapReply = new MapBlockReplyPacket();
418 mapReply.AgentData.AgentID = this.AgentID; 411 mapReply.AgentData.AgentID = this.AgentId;
419 mapReply.Data = new MapBlockReplyPacket.DataBlock[mapBlocks.Count]; 412 mapReply.Data = new MapBlockReplyPacket.DataBlock[mapBlocks.Count];
420 mapReply.AgentData.Flags = 0; 413 mapReply.AgentData.Flags = 0;
421 414
@@ -437,7 +430,7 @@ namespace OpenSim.Region.ClientStack
437 public void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags) 430 public void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags)
438 { 431 {
439 TeleportLocalPacket tpLocal = new TeleportLocalPacket(); 432 TeleportLocalPacket tpLocal = new TeleportLocalPacket();
440 tpLocal.Info.AgentID = this.AgentID; 433 tpLocal.Info.AgentID = this.AgentId;
441 tpLocal.Info.TeleportFlags = flags; 434 tpLocal.Info.TeleportFlags = flags;
442 tpLocal.Info.LocationID = 2; 435 tpLocal.Info.LocationID = 2;
443 tpLocal.Info.LookAt = lookAt; 436 tpLocal.Info.LookAt = lookAt;
@@ -448,7 +441,7 @@ namespace OpenSim.Region.ClientStack
448 public void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint newRegionEndPoint, uint locationID, uint flags, string capsURL) 441 public void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint newRegionEndPoint, uint locationID, uint flags, string capsURL)
449 { 442 {
450 TeleportFinishPacket teleport = new TeleportFinishPacket(); 443 TeleportFinishPacket teleport = new TeleportFinishPacket();
451 teleport.Info.AgentID = this.AgentID; 444 teleport.Info.AgentID = this.AgentId;
452 teleport.Info.RegionHandle = regionHandle; 445 teleport.Info.RegionHandle = regionHandle;
453 teleport.Info.SimAccess = simAccess; 446 teleport.Info.SimAccess = simAccess;
454 447
@@ -475,8 +468,8 @@ namespace OpenSim.Region.ClientStack
475 public void SendTeleportCancel() 468 public void SendTeleportCancel()
476 { 469 {
477 TeleportCancelPacket tpCancel = new TeleportCancelPacket(); 470 TeleportCancelPacket tpCancel = new TeleportCancelPacket();
478 tpCancel.Info.SessionID = this.SessionID; 471 tpCancel.Info.SessionID = this.m_sessionId;
479 tpCancel.Info.AgentID = this.AgentID; 472 tpCancel.Info.AgentID = this.AgentId;
480 473
481 OutPacket(tpCancel); 474 OutPacket(tpCancel);
482 } 475 }
@@ -494,7 +487,7 @@ namespace OpenSim.Region.ClientStack
494 public void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance) 487 public void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance)
495 { 488 {
496 MoneyBalanceReplyPacket money = new MoneyBalanceReplyPacket(); 489 MoneyBalanceReplyPacket money = new MoneyBalanceReplyPacket();
497 money.MoneyData.AgentID = this.AgentID; 490 money.MoneyData.AgentID = this.AgentId;
498 money.MoneyData.TransactionID = transaction; 491 money.MoneyData.TransactionID = transaction;
499 money.MoneyData.TransactionSuccess = success; 492 money.MoneyData.TransactionSuccess = success;
500 money.MoneyData.Description = description; 493 money.MoneyData.Description = description;
@@ -641,7 +634,7 @@ namespace OpenSim.Region.ClientStack
641 Encoding enc = Encoding.ASCII; 634 Encoding enc = Encoding.ASCII;
642 uint FULL_MASK_PERMISSIONS = 2147483647; 635 uint FULL_MASK_PERMISSIONS = 2147483647;
643 UpdateCreateInventoryItemPacket InventoryReply = new UpdateCreateInventoryItemPacket(); 636 UpdateCreateInventoryItemPacket InventoryReply = new UpdateCreateInventoryItemPacket();
644 InventoryReply.AgentData.AgentID = this.AgentID; 637 InventoryReply.AgentData.AgentID = this.AgentId;
645 InventoryReply.AgentData.SimApproved = true; 638 InventoryReply.AgentData.SimApproved = true;
646 InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1]; 639 InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1];
647 InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock(); 640 InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock();
@@ -672,8 +665,8 @@ namespace OpenSim.Region.ClientStack
672 public void SendRemoveInventoryItem(LLUUID itemID) 665 public void SendRemoveInventoryItem(LLUUID itemID)
673 { 666 {
674 RemoveInventoryItemPacket remove = new RemoveInventoryItemPacket(); 667 RemoveInventoryItemPacket remove = new RemoveInventoryItemPacket();
675 remove.AgentData.AgentID = this.AgentID; 668 remove.AgentData.AgentID = this.AgentId;
676 remove.AgentData.SessionID = this.SessionID; 669 remove.AgentData.SessionID = this.m_sessionId;
677 remove.InventoryData = new RemoveInventoryItemPacket.InventoryDataBlock[1]; 670 remove.InventoryData = new RemoveInventoryItemPacket.InventoryDataBlock[1];
678 remove.InventoryData[0] = new RemoveInventoryItemPacket.InventoryDataBlock(); 671 remove.InventoryData[0] = new RemoveInventoryItemPacket.InventoryDataBlock();
679 remove.InventoryData[0].ItemID = itemID; 672 remove.InventoryData[0].ItemID = itemID;
@@ -718,7 +711,7 @@ namespace OpenSim.Region.ClientStack
718 public void SendAgentAlertMessage(string message, bool modal) 711 public void SendAgentAlertMessage(string message, bool modal)
719 { 712 {
720 AgentAlertMessagePacket alertPack = new AgentAlertMessagePacket(); 713 AgentAlertMessagePacket alertPack = new AgentAlertMessagePacket();
721 alertPack.AgentData.AgentID = this.AgentID; 714 alertPack.AgentData.AgentID = this.AgentId;
722 alertPack.AlertData.Message = Helpers.StringToField(message); 715 alertPack.AlertData.Message = Helpers.StringToField(message);
723 alertPack.AlertData.Modal = modal; 716 alertPack.AlertData.Modal = modal;
724 OutPacket(alertPack); 717 OutPacket(alertPack);
@@ -799,7 +792,7 @@ namespace OpenSim.Region.ClientStack
799 public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID) 792 public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID)
800 { 793 {
801 AvatarPropertiesReplyPacket avatarReply = new AvatarPropertiesReplyPacket(); 794 AvatarPropertiesReplyPacket avatarReply = new AvatarPropertiesReplyPacket();
802 avatarReply.AgentData.AgentID = this.AgentID; 795 avatarReply.AgentData.AgentID = this.AgentId;
803 avatarReply.AgentData.AvatarID = avatarID; 796 avatarReply.AgentData.AvatarID = avatarID;
804 avatarReply.PropertiesData.AboutText = Helpers.StringToField(aboutText); 797 avatarReply.PropertiesData.AboutText = Helpers.StringToField(aboutText);
805 avatarReply.PropertiesData.BornOn = Helpers.StringToField(bornOn); 798 avatarReply.PropertiesData.BornOn = Helpers.StringToField(bornOn);
@@ -823,9 +816,9 @@ namespace OpenSim.Region.ClientStack
823 public void SendWearables(AvatarWearable[] wearables) 816 public void SendWearables(AvatarWearable[] wearables)
824 { 817 {
825 AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket(); 818 AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket();
826 aw.AgentData.AgentID = this.AgentID; 819 aw.AgentData.AgentID = this.AgentId;
827 aw.AgentData.SerialNum = 0; 820 aw.AgentData.SerialNum = 0;
828 aw.AgentData.SessionID = this.SessionID; 821 aw.AgentData.SessionID = this.m_sessionId;
829 822
830 aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13]; 823 aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13];
831 AgentWearablesUpdatePacket.WearableDataBlock awb; 824 AgentWearablesUpdatePacket.WearableDataBlock awb;
@@ -968,8 +961,8 @@ namespace OpenSim.Region.ClientStack
968 public void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint) 961 public void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint)
969 { 962 {
970 ObjectAttachPacket attach = new ObjectAttachPacket(); 963 ObjectAttachPacket attach = new ObjectAttachPacket();
971 attach.AgentData.AgentID = this.AgentID; 964 attach.AgentData.AgentID = this.AgentId;
972 attach.AgentData.SessionID = this.SessionID; 965 attach.AgentData.SessionID = this.m_sessionId;
973 attach.AgentData.AttachmentPoint = attachPoint; 966 attach.AgentData.AttachmentPoint = attachPoint;
974 attach.ObjectData = new ObjectAttachPacket.ObjectDataBlock[1]; 967 attach.ObjectData = new ObjectAttachPacket.ObjectDataBlock[1];
975 attach.ObjectData[0] = new ObjectAttachPacket.ObjectDataBlock(); 968 attach.ObjectData[0] = new ObjectAttachPacket.ObjectDataBlock();
@@ -1284,7 +1277,7 @@ namespace OpenSim.Region.ClientStack
1284 objdata.ID = 8880000; 1277 objdata.ID = 8880000;
1285 objdata.NameValue = enc.GetBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User \0"); 1278 objdata.NameValue = enc.GetBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User \0");
1286 LLVector3 pos2 = new LLVector3(100f, 100f, 23f); 1279 LLVector3 pos2 = new LLVector3(100f, 100f, 23f);
1287 //objdata.FullID=user.AgentID; 1280 //objdata.FullID=user.AgentId;
1288 byte[] pb = pos.GetBytes(); 1281 byte[] pb = pos.GetBytes();
1289 Array.Copy(pb, 0, objdata.ObjectData, 16, pb.Length); 1282 Array.Copy(pb, 0, objdata.ObjectData, 16, pb.Length);
1290 1283