aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorAdam Johnson2007-12-07 08:54:31 +0000
committerAdam Johnson2007-12-07 08:54:31 +0000
commit3d938f76b7c2f8ede862f9979383d79dfb21372c (patch)
tree0c99beb3affa959f596e079f20ed806364e3d3dc /OpenSim/Region/ClientStack
parent* Added hacked support for 'anyone can move' and 'anyone can copy'. (diff)
downloadopensim-SC_OLD-3d938f76b7c2f8ede862f9979383d79dfb21372c.zip
opensim-SC_OLD-3d938f76b7c2f8ede862f9979383d79dfb21372c.tar.gz
opensim-SC_OLD-3d938f76b7c2f8ede862f9979383d79dfb21372c.tar.bz2
opensim-SC_OLD-3d938f76b7c2f8ede862f9979383d79dfb21372c.tar.xz
Updates to LibSL revision 1498. Thanks Johan!
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs31
1 files changed, 14 insertions, 17 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 284a2de..b2db4cb 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -722,9 +722,11 @@ namespace OpenSim.Region.ClientStack
722 /// 722 ///
723 /// </summary> 723 /// </summary>
724 /// <param name="regInfo"></param> 724 /// <param name="regInfo"></param>
725 private byte[] m_channelVersion=new byte[] { 0x00} ; // Dummy value needed by libSL
725 public void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look) 726 public void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look)
726 { 727 {
727 AgentMovementCompletePacket mov = new AgentMovementCompletePacket(); 728 AgentMovementCompletePacket mov = new AgentMovementCompletePacket();
729 mov.SimData.ChannelVersion = m_channelVersion;
728 mov.AgentData.SessionID = m_sessionId; 730 mov.AgentData.SessionID = m_sessionId;
729 mov.AgentData.AgentID = AgentId; 731 mov.AgentData.AgentID = AgentId;
730 mov.Data.RegionHandle = regInfo.RegionHandle; 732 mov.Data.RegionHandle = regInfo.RegionHandle;
@@ -1170,15 +1172,13 @@ namespace OpenSim.Region.ClientStack
1170 inventoryReply.InventoryData[0].SaleType = 0; 1172 inventoryReply.InventoryData[0].SaleType = 0;
1171 inventoryReply.InventoryData[0].Type = (sbyte) item.assetType; 1173 inventoryReply.InventoryData[0].Type = (sbyte) item.assetType;
1172 inventoryReply.InventoryData[0].CRC = 1174 inventoryReply.InventoryData[0].CRC =
1173 Helpers.InventoryCRC(inventoryReply.InventoryData[0].CreationDate, inventoryReply.InventoryData[0].SaleType, 1175 Helpers.InventoryCRC(1000, 0, inventoryReply.InventoryData[0].InvType,
1174 inventoryReply.InventoryData[0].InvType,
1175 inventoryReply.InventoryData[0].Type, inventoryReply.InventoryData[0].AssetID, 1176 inventoryReply.InventoryData[0].Type, inventoryReply.InventoryData[0].AssetID,
1176 inventoryReply.InventoryData[0].GroupID, inventoryReply.InventoryData[0].SalePrice, 1177 inventoryReply.InventoryData[0].GroupID, 100,
1177 inventoryReply.InventoryData[0].OwnerID, inventoryReply.InventoryData[0].CreatorID, 1178 inventoryReply.InventoryData[0].OwnerID, inventoryReply.InventoryData[0].CreatorID,
1178 inventoryReply.InventoryData[0].ItemID, inventoryReply.InventoryData[0].FolderID, 1179 inventoryReply.InventoryData[0].ItemID, inventoryReply.InventoryData[0].FolderID,
1179 inventoryReply.InventoryData[0].EveryoneMask, inventoryReply.InventoryData[0].Flags, 1180 FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS,
1180 inventoryReply.InventoryData[0].NextOwnerMask, inventoryReply.InventoryData[0].GroupMask, 1181 FULL_MASK_PERMISSIONS);
1181 inventoryReply.InventoryData[0].OwnerMask);
1182 1182
1183 OutPacket(inventoryReply, ThrottleOutPacketType.Asset); 1183 OutPacket(inventoryReply, ThrottleOutPacketType.Asset);
1184 } 1184 }
@@ -1213,16 +1213,13 @@ namespace OpenSim.Region.ClientStack
1213 InventoryReply.InventoryData[0].SaleType = 0; 1213 InventoryReply.InventoryData[0].SaleType = 0;
1214 InventoryReply.InventoryData[0].Type = (sbyte) Item.assetType; 1214 InventoryReply.InventoryData[0].Type = (sbyte) Item.assetType;
1215 InventoryReply.InventoryData[0].CRC = 1215 InventoryReply.InventoryData[0].CRC =
1216 Helpers.InventoryCRC(InventoryReply.InventoryData[0].CreationDate, InventoryReply.InventoryData[0].SaleType, 1216 Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType,
1217 InventoryReply.InventoryData[0].InvType,
1218 InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, 1217 InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID,
1219 InventoryReply.InventoryData[0].GroupID, InventoryReply.InventoryData[0].SalePrice, 1218 InventoryReply.InventoryData[0].GroupID, 100,
1220 InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, 1219 InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID,
1221 InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, 1220 InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID,
1222 InventoryReply.InventoryData[0].EveryoneMask, InventoryReply.InventoryData[0].Flags, 1221 FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS,
1223 InventoryReply.InventoryData[0].NextOwnerMask, InventoryReply.InventoryData[0].GroupMask, 1222 FULL_MASK_PERMISSIONS);
1224 InventoryReply.InventoryData[0].OwnerMask);
1225
1226 1223
1227 OutPacket(InventoryReply, ThrottleOutPacketType.Asset); 1224 OutPacket(InventoryReply, ThrottleOutPacketType.Asset);
1228 } 1225 }
@@ -1602,7 +1599,6 @@ namespace OpenSim.Region.ClientStack
1602 outPacket.ObjectData[0].ClickAction = clickAction; 1599 outPacket.ObjectData[0].ClickAction = clickAction;
1603 //outPacket.ObjectData[0].Flags = 0; 1600 //outPacket.ObjectData[0].Flags = 0;
1604 outPacket.ObjectData[0].Radius = 20; 1601 outPacket.ObjectData[0].Radius = 20;
1605
1606 1602
1607 byte[] pb = pos.GetBytes(); 1603 byte[] pb = pos.GetBytes();
1608 Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length); 1604 Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
@@ -2904,7 +2900,7 @@ namespace OpenSim.Region.ClientStack
2904 { 2900 {
2905 if (OnObjectDescription != null) 2901 if (OnObjectDescription != null)
2906 { 2902 {
2907 OnObjectDescription(this,objDes.ObjectData[i].LocalID, 2903 OnObjectDescription(this, objDes.ObjectData[i].LocalID,
2908 enc.GetString(objDes.ObjectData[i].Description)); 2904 enc.GetString(objDes.ObjectData[i].Description));
2909 } 2905 }
2910 } 2906 }
@@ -2915,7 +2911,7 @@ namespace OpenSim.Region.ClientStack
2915 { 2911 {
2916 if (OnObjectName != null) 2912 if (OnObjectName != null)
2917 { 2913 {
2918 OnObjectName(this,objName.ObjectData[i].LocalID, enc.GetString(objName.ObjectData[i].Name)); 2914 OnObjectName(this, objName.ObjectData[i].LocalID, enc.GetString(objName.ObjectData[i].Name));
2919 } 2915 }
2920 } 2916 }
2921 break; 2917 break;
@@ -3003,7 +2999,8 @@ namespace OpenSim.Region.ClientStack
3003 // Console.WriteLine("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionId).ToStringHyphenated()); 2999 // Console.WriteLine("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionId).ToStringHyphenated());
3004 if (OnAssetUploadRequest != null) 3000 if (OnAssetUploadRequest != null)
3005 { 3001 {
3006 OnAssetUploadRequest(this, request.AssetBlock.TransactionID.Combine(SecureSessionId), 3002 LLUUID temp=libsecondlife.LLUUID.Combine(request.AssetBlock.TransactionID, SecureSessionId);
3003 OnAssetUploadRequest(this, temp,
3007 request.AssetBlock.TransactionID, request.AssetBlock.Type, 3004 request.AssetBlock.TransactionID, request.AssetBlock.Type,
3008 request.AssetBlock.AssetData, request.AssetBlock.StoreLocal); 3005 request.AssetBlock.AssetData, request.AssetBlock.StoreLocal);
3009 } 3006 }