aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs12
-rw-r--r--OpenSim/Data/MSSQL/MSSQLRegionData.cs4
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs4
-rw-r--r--OpenSim/Framework/LandData.cs18
-rw-r--r--OpenSim/Framework/LandUpdateArgs.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs23
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs37
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs2
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs3
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs6
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs10
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs8
-rw-r--r--OpenSim/Region/DataSnapshot/LandSnapshot.cs14
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/UuidGatherer.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs3
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
-rw-r--r--OpenSim/Tools/pCampBot/PhysicsBot.cs22
23 files changed, 107 insertions, 89 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index cd23efb..67ba016 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -659,8 +659,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
659 659
660 foreach (ILandObject parcel in parcels) 660 foreach (ILandObject parcel in parcels)
661 { 661 {
662 parcel.landData.Flags |= (uint) Parcel.ParcelFlags.AllowVoiceChat; 662 parcel.landData.Flags |= (uint) ParcelFlags.AllowVoiceChat;
663 parcel.landData.Flags |= (uint) Parcel.ParcelFlags.UseEstateVoiceChan; 663 parcel.landData.Flags |= (uint) ParcelFlags.UseEstateVoiceChan;
664 ((Scene)newscene).LandChannel.UpdateLandObject(parcel.landData.LocalID, parcel.landData); 664 ((Scene)newscene).LandChannel.UpdateLandObject(parcel.landData.LocalID, parcel.landData);
665 } 665 }
666 } 666 }
@@ -911,13 +911,13 @@ namespace OpenSim.ApplicationPlugins.RemoteController
911 { 911 {
912 if (enableVoice) 912 if (enableVoice)
913 { 913 {
914 parcel.landData.Flags |= (uint)Parcel.ParcelFlags.AllowVoiceChat; 914 parcel.landData.Flags |= (uint)ParcelFlags.AllowVoiceChat;
915 parcel.landData.Flags |= (uint)Parcel.ParcelFlags.UseEstateVoiceChan; 915 parcel.landData.Flags |= (uint)ParcelFlags.UseEstateVoiceChan;
916 } 916 }
917 else 917 else
918 { 918 {
919 parcel.landData.Flags &= ~(uint)Parcel.ParcelFlags.AllowVoiceChat; 919 parcel.landData.Flags &= ~(uint)ParcelFlags.AllowVoiceChat;
920 parcel.landData.Flags &= ~(uint)Parcel.ParcelFlags.UseEstateVoiceChan; 920 parcel.landData.Flags &= ~(uint)ParcelFlags.UseEstateVoiceChan;
921 } 921 }
922 scene.LandChannel.UpdateLandObject(parcel.landData.LocalID, parcel.landData); 922 scene.LandChannel.UpdateLandObject(parcel.landData.LocalID, parcel.landData);
923 } 923 }
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index 5a0eda8..0fe8de7 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -875,13 +875,13 @@ VALUES
875 newData.IsGroupOwned = Convert.ToBoolean(row["IsGroupOwned"]); 875 newData.IsGroupOwned = Convert.ToBoolean(row["IsGroupOwned"]);
876 newData.Area = Convert.ToInt32(row["Area"]); 876 newData.Area = Convert.ToInt32(row["Area"]);
877 newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented 877 newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented
878 newData.Category = (Parcel.ParcelCategory)Convert.ToInt32(row["Category"]); 878 newData.Category = (ParcelCategory)Convert.ToInt32(row["Category"]);
879 //Enum libsecondlife.Parcel.ParcelCategory 879 //Enum libsecondlife.Parcel.ParcelCategory
880 newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]); 880 newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]);
881 newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]); 881 newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]);
882 newData.GroupID = new UUID((Guid)row["GroupUUID"]); 882 newData.GroupID = new UUID((Guid)row["GroupUUID"]);
883 newData.SalePrice = Convert.ToInt32(row["SalePrice"]); 883 newData.SalePrice = Convert.ToInt32(row["SalePrice"]);
884 newData.Status = (Parcel.ParcelStatus)Convert.ToInt32(row["LandStatus"]); 884 newData.Status = (ParcelStatus)Convert.ToInt32(row["LandStatus"]);
885 //Enum. libsecondlife.Parcel.ParcelStatus 885 //Enum. libsecondlife.Parcel.ParcelStatus
886 newData.Flags = Convert.ToUInt32(row["LandFlags"]); 886 newData.Flags = Convert.ToUInt32(row["LandFlags"]);
887 newData.LandingType = Convert.ToByte(row["LandingType"]); 887 newData.LandingType = Convert.ToByte(row["LandingType"]);
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index fafba16..09564de 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -1073,13 +1073,13 @@ namespace OpenSim.Data.MySQL
1073 newData.IsGroupOwned = Convert.ToBoolean(row["IsGroupOwned"]); 1073 newData.IsGroupOwned = Convert.ToBoolean(row["IsGroupOwned"]);
1074 newData.Area = Convert.ToInt32(row["Area"]); 1074 newData.Area = Convert.ToInt32(row["Area"]);
1075 newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unimplemented 1075 newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unimplemented
1076 newData.Category = (Parcel.ParcelCategory) Convert.ToInt32(row["Category"]); 1076 newData.Category = (ParcelCategory) Convert.ToInt32(row["Category"]);
1077 //Enum libsecondlife.Parcel.ParcelCategory 1077 //Enum libsecondlife.Parcel.ParcelCategory
1078 newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]); 1078 newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]);
1079 newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]); 1079 newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]);
1080 newData.GroupID = new UUID((String) row["GroupUUID"]); 1080 newData.GroupID = new UUID((String) row["GroupUUID"]);
1081 newData.SalePrice = Convert.ToInt32(row["SalePrice"]); 1081 newData.SalePrice = Convert.ToInt32(row["SalePrice"]);
1082 newData.Status = (Parcel.ParcelStatus) Convert.ToInt32(row["LandStatus"]); 1082 newData.Status = (ParcelStatus) Convert.ToInt32(row["LandStatus"]);
1083 //Enum. libsecondlife.Parcel.ParcelStatus 1083 //Enum. libsecondlife.Parcel.ParcelStatus
1084 newData.Flags = Convert.ToUInt32(row["LandFlags"]); 1084 newData.Flags = Convert.ToUInt32(row["LandFlags"]);
1085 newData.LandingType = Convert.ToByte(row["LandingType"]); 1085 newData.LandingType = Convert.ToByte(row["LandingType"]);
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 16a05af..2f9f59d 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -1314,13 +1314,13 @@ namespace OpenSim.Data.SQLite
1314 newData.IsGroupOwned = (Boolean) row["IsGroupOwned"]; 1314 newData.IsGroupOwned = (Boolean) row["IsGroupOwned"];
1315 newData.Area = Convert.ToInt32(row["Area"]); 1315 newData.Area = Convert.ToInt32(row["Area"]);
1316 newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented 1316 newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented
1317 newData.Category = (Parcel.ParcelCategory) Convert.ToInt32(row["Category"]); 1317 newData.Category = (ParcelCategory) Convert.ToInt32(row["Category"]);
1318 //Enum OpenMetaverse.Parcel.ParcelCategory 1318 //Enum OpenMetaverse.Parcel.ParcelCategory
1319 newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]); 1319 newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]);
1320 newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]); 1320 newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]);
1321 newData.GroupID = new UUID((String) row["GroupUUID"]); 1321 newData.GroupID = new UUID((String) row["GroupUUID"]);
1322 newData.SalePrice = Convert.ToInt32(row["SalePrice"]); 1322 newData.SalePrice = Convert.ToInt32(row["SalePrice"]);
1323 newData.Status = (Parcel.ParcelStatus) Convert.ToInt32(row["LandStatus"]); 1323 newData.Status = (ParcelStatus) Convert.ToInt32(row["LandStatus"]);
1324 //Enum. OpenMetaverse.Parcel.ParcelStatus 1324 //Enum. OpenMetaverse.Parcel.ParcelStatus
1325 newData.Flags = Convert.ToUInt32(row["LandFlags"]); 1325 newData.Flags = Convert.ToUInt32(row["LandFlags"]);
1326 newData.LandingType = (Byte) row["LandingType"]; 1326 newData.LandingType = (Byte) row["LandingType"];
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index f793213..d6afb95 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Framework
38 private int _area = 0; 38 private int _area = 0;
39 private uint _auctionID = 0; //Unemplemented. If set to 0, not being auctioned 39 private uint _auctionID = 0; //Unemplemented. If set to 0, not being auctioned
40 private UUID _authBuyerID = UUID.Zero; //Unemplemented. Authorized Buyer's UUID 40 private UUID _authBuyerID = UUID.Zero; //Unemplemented. Authorized Buyer's UUID
41 private Parcel.ParcelCategory _category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category 41 private ParcelCategory _category = ParcelCategory.None; //Unemplemented. Parcel's chosen category
42 private int _claimDate = 0; 42 private int _claimDate = 0;
43 private int _claimPrice = 0; //Unemplemented 43 private int _claimPrice = 0; //Unemplemented
44 private UUID _globalID = UUID.Zero; 44 private UUID _globalID = UUID.Zero;
@@ -49,15 +49,15 @@ namespace OpenSim.Framework
49 private string _description = String.Empty; 49 private string _description = String.Empty;
50 50
51 51
52 private uint _flags = (uint) Parcel.ParcelFlags.AllowFly | (uint) Parcel.ParcelFlags.AllowLandmark | 52 private uint _flags = (uint) ParcelFlags.AllowFly | (uint) ParcelFlags.AllowLandmark |
53 (uint) Parcel.ParcelFlags.AllowAPrimitiveEntry | 53 (uint) ParcelFlags.AllowAPrimitiveEntry |
54 (uint) Parcel.ParcelFlags.AllowDeedToGroup | (uint) Parcel.ParcelFlags.AllowTerraform | 54 (uint) ParcelFlags.AllowDeedToGroup | (uint) ParcelFlags.AllowTerraform |
55 (uint) Parcel.ParcelFlags.CreateObjects | (uint) Parcel.ParcelFlags.AllowOtherScripts | 55 (uint) ParcelFlags.CreateObjects | (uint) ParcelFlags.AllowOtherScripts |
56 (uint) Parcel.ParcelFlags.SoundLocal; 56 (uint) ParcelFlags.SoundLocal;
57 57
58 private byte _landingType = 0; 58 private byte _landingType = 0;
59 private string _name = "Your Parcel"; 59 private string _name = "Your Parcel";
60 private Parcel.ParcelStatus _status = Parcel.ParcelStatus.Leased; 60 private ParcelStatus _status = ParcelStatus.Leased;
61 private int _localID = 0; 61 private int _localID = 0;
62 private byte _mediaAutoScale = 0; 62 private byte _mediaAutoScale = 0;
63 private UUID _mediaID = UUID.Zero; 63 private UUID _mediaID = UUID.Zero;
@@ -125,7 +125,7 @@ namespace OpenSim.Framework
125 } 125 }
126 } 126 }
127 127
128 public Parcel.ParcelCategory Category { 128 public ParcelCategory Category {
129 get { 129 get {
130 return _category; 130 return _category;
131 } 131 }
@@ -233,7 +233,7 @@ namespace OpenSim.Framework
233 } 233 }
234 } 234 }
235 235
236 public Parcel.ParcelStatus Status { 236 public ParcelStatus Status {
237 get { 237 get {
238 return _status; 238 return _status;
239 } 239 }
diff --git a/OpenSim/Framework/LandUpdateArgs.cs b/OpenSim/Framework/LandUpdateArgs.cs
index 7b065a3..9760a1d 100644
--- a/OpenSim/Framework/LandUpdateArgs.cs
+++ b/OpenSim/Framework/LandUpdateArgs.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Framework
33 public class LandUpdateArgs : EventArgs 33 public class LandUpdateArgs : EventArgs
34 { 34 {
35 public UUID AuthBuyerID; 35 public UUID AuthBuyerID;
36 public Parcel.ParcelCategory Category; 36 public ParcelCategory Category;
37 public string Desc; 37 public string Desc;
38 public UUID GroupID; 38 public UUID GroupID;
39 public byte LandingType; 39 public byte LandingType;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs b/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs
index 5091793..a80c1f0 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs
@@ -36,14 +36,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
36 /// </summary> 36 /// </summary>
37 class KillPacket : Packet 37 class KillPacket : Packet
38 { 38 {
39 private Header header;
40
41 public override int Length 39 public override int Length
42 { 40 {
43 get { return 0; } 41 get { return 0; }
44 } 42 }
45 43
46 public override void FromBytes(Header header, byte[] bytes, ref int i, ref int packetEnd, byte[] zeroBuffer) 44 public override void FromBytes(Header header, byte[] bytes, ref int i, ref int packetEnd)
47 { 45 {
48 } 46 }
49 47
@@ -51,26 +49,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
51 { 49 {
52 } 50 }
53 51
54 public override Header Header { get { return header; } set { header = value; }}
55
56 public override byte[] ToBytes() 52 public override byte[] ToBytes()
57 { 53 {
58 return new byte[0]; 54 return new byte[0];
59 } 55 }
60 56
61 public KillPacket() 57 public override byte[][] ToBytesMultiple()
62 { 58 {
63 Header = new LowHeader(); 59 return new byte[][] { new byte[0] };
64 Header.ID = 65531;
65 Header.Reliable = true;
66 } 60 }
67 61
68 public override PacketType Type 62 public KillPacket()
69 { 63 {
70 get 64 Type = PacketType.UseCircuitCode;
71 { 65 Header = new Header();
72 return PacketType.UseCircuitCode; 66 Header.Frequency = OpenMetaverse.PacketFrequency.Low;
73 } 67 Header.ID = 65531;
68 Header.Reliable = true;
74 } 69 }
75 } 70 }
76} 71}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index c0c074b..9d839ab 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -45,6 +45,7 @@ using OpenSim.Region.Framework.Interfaces;
45using OpenSim.Region.Framework.Scenes; 45using OpenSim.Region.Framework.Scenes;
46using OpenSim.Services.Interfaces; 46using OpenSim.Services.Interfaces;
47using Timer=System.Timers.Timer; 47using Timer=System.Timers.Timer;
48using AssetLandmark = OpenSim.Framework.AssetLandmark;
48using Nini.Config; 49using Nini.Config;
49 50
50namespace OpenSim.Region.ClientStack.LindenUDP 51namespace OpenSim.Region.ClientStack.LindenUDP
@@ -1266,7 +1267,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1266 public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args) 1267 public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args)
1267 { 1268 {
1268 RegionHandshakePacket handshake = (RegionHandshakePacket)PacketPool.Instance.GetPacket(PacketType.RegionHandshake); 1269 RegionHandshakePacket handshake = (RegionHandshakePacket)PacketPool.Instance.GetPacket(PacketType.RegionHandshake);
1269 1270 handshake.RegionInfo = new RegionHandshakePacket.RegionInfoBlock();
1270 handshake.RegionInfo.BillableFactor = args.billableFactor; 1271 handshake.RegionInfo.BillableFactor = args.billableFactor;
1271 handshake.RegionInfo.IsEstateManager = args.isEstateManager; 1272 handshake.RegionInfo.IsEstateManager = args.isEstateManager;
1272 handshake.RegionInfo.TerrainHeightRange00 = args.terrainHeightRange0; 1273 handshake.RegionInfo.TerrainHeightRange00 = args.terrainHeightRange0;
@@ -1292,14 +1293,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1292 handshake.RegionInfo.TerrainDetail2 = args.terrainDetail2; 1293 handshake.RegionInfo.TerrainDetail2 = args.terrainDetail2;
1293 handshake.RegionInfo.TerrainDetail3 = args.terrainDetail3; 1294 handshake.RegionInfo.TerrainDetail3 = args.terrainDetail3;
1294 handshake.RegionInfo.CacheID = UUID.Random(); //I guess this is for the client to remember an old setting? 1295 handshake.RegionInfo.CacheID = UUID.Random(); //I guess this is for the client to remember an old setting?
1295 1296 handshake.RegionInfo2 = new RegionHandshakePacket.RegionInfo2Block();
1296 handshake.RegionInfo2.RegionID = regionInfo.RegionID; 1297 handshake.RegionInfo2.RegionID = regionInfo.RegionID;
1298
1299 handshake.RegionInfo3 = new RegionHandshakePacket.RegionInfo3Block();
1300 handshake.RegionInfo3.CPUClassID = 9;
1301 handshake.RegionInfo3.CPURatio = 1;
1297 1302
1298// handshake.RegionInfo3.ColoName = Utils.EmptyBytes; 1303 handshake.RegionInfo3.ColoName = Utils.EmptyBytes;
1299// handshake.RegionInfo3.CPUClassID = 0; 1304 handshake.RegionInfo3.ProductName = Utils.EmptyBytes;
1300// handshake.RegionInfo3.CPURatio = 0; 1305 handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes;
1301// handshake.RegionInfo3.ProductName = Utils.StringToBytes("OpenSim");
1302// handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes;
1303 1306
1304 OutPacket(handshake, ThrottleOutPacketType.Task); 1307 OutPacket(handshake, ThrottleOutPacketType.Task);
1305 } 1308 }
@@ -3551,8 +3554,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3551 rinfoblk.UseEstateSun = args.useEstateSun; 3554 rinfoblk.UseEstateSun = args.useEstateSun;
3552 rinfoblk.WaterHeight = args.waterHeight; 3555 rinfoblk.WaterHeight = args.waterHeight;
3553 rinfoblk.SimName = Utils.StringToBytes(args.simName); 3556 rinfoblk.SimName = Utils.StringToBytes(args.simName);
3554 3557
3558 rinfopack.RegionInfo2 = new RegionInfoPacket.RegionInfo2Block();
3559 rinfopack.RegionInfo2.HardMaxAgents = uint.MaxValue;
3560 rinfopack.RegionInfo2.HardMaxObjects = uint.MaxValue;
3561 rinfopack.RegionInfo2.MaxAgents32 = uint.MaxValue;
3562 rinfopack.RegionInfo2.ProductName = Utils.EmptyBytes;
3563 rinfopack.RegionInfo2.ProductSKU = Utils.EmptyBytes;
3564
3565 rinfopack.HasVariableBlocks = true;
3555 rinfopack.RegionInfo = rinfoblk; 3566 rinfopack.RegionInfo = rinfoblk;
3567 rinfopack.AgentData = new RegionInfoPacket.AgentDataBlock();
3568 rinfopack.AgentData.AgentID = AgentId;
3569 rinfopack.AgentData.SessionID = SessionId;
3570
3556 3571
3557 OutPacket(rinfopack, ThrottleOutPacketType.Task); 3572 OutPacket(rinfopack, ThrottleOutPacketType.Task);
3558 } 3573 }
@@ -7536,7 +7551,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7536 LandUpdateArgs args = new LandUpdateArgs(); 7551 LandUpdateArgs args = new LandUpdateArgs();
7537 7552
7538 args.AuthBuyerID = parcelPropertiesPacket.ParcelData.AuthBuyerID; 7553 args.AuthBuyerID = parcelPropertiesPacket.ParcelData.AuthBuyerID;
7539 args.Category = (Parcel.ParcelCategory)parcelPropertiesPacket.ParcelData.Category; 7554 args.Category = (ParcelCategory)parcelPropertiesPacket.ParcelData.Category;
7540 args.Desc = Utils.BytesToString(parcelPropertiesPacket.ParcelData.Desc); 7555 args.Desc = Utils.BytesToString(parcelPropertiesPacket.ParcelData.Desc);
7541 args.GroupID = parcelPropertiesPacket.ParcelData.GroupID; 7556 args.GroupID = parcelPropertiesPacket.ParcelData.GroupID;
7542 args.LandingType = parcelPropertiesPacket.ParcelData.LandingType; 7557 args.LandingType = parcelPropertiesPacket.ParcelData.LandingType;
@@ -10030,8 +10045,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10030 10045
10031 // Bit 0: Mature, bit 7: on sale, other bits: no idea 10046 // Bit 0: Mature, bit 7: on sale, other bits: no idea
10032 reply.Data.Flags = (byte)( 10047 reply.Data.Flags = (byte)(
10033 ((land.Flags & (uint)Parcel.ParcelFlags.MaturePublish) != 0 ? (1 << 0) : 0) + 10048 ((land.Flags & (uint)ParcelFlags.MaturePublish) != 0 ? (1 << 0) : 0) +
10034 ((land.Flags & (uint)Parcel.ParcelFlags.ForSale) != 0 ? (1 << 7) : 0)); 10049 ((land.Flags & (uint)ParcelFlags.ForSale) != 0 ? (1 << 7) : 0));
10035 10050
10036 Vector3 pos = land.UserLocation; 10051 Vector3 pos = land.UserLocation;
10037 if (pos.Equals(Vector3.Zero)) 10052 if (pos.Equals(Vector3.Zero))
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
index 4b1a6b7..fad9218 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
@@ -827,7 +827,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
827 sendbuffer.Length, SocketFlags.None, m_Client.CircuitCode); 827 sendbuffer.Length, SocketFlags.None, m_Client.CircuitCode);
828 } 828 }
829 } 829 }
830 catch (NullReferenceException) 830 catch (NullReferenceException n)
831 { 831 {
832 m_log.Debug("[PACKET] Detected reuse of a returned packet"); 832 m_log.Debug("[PACKET] Detected reuse of a returned packet");
833 m_PacketQueue.Cancel(item.Sequence); 833 m_PacketQueue.Cancel(item.Sequence);
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index c0ca126..0d3cc23 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -33,6 +33,7 @@ using System.Text;
33using log4net; 33using log4net;
34using Nini.Config; 34using Nini.Config;
35using OpenMetaverse; 35using OpenMetaverse;
36using OpenMetaverse.Assets;
36using OpenMetaverse.Imaging; 37using OpenMetaverse.Imaging;
37using OpenSim.Framework; 38using OpenSim.Framework;
38using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
@@ -391,7 +392,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
391 if (i == (Layers.Length - 1)) 392 if (i == (Layers.Length - 1))
392 strEnd = ""; 393 strEnd = "";
393 394
394 stringResult.AppendFormat("{0}|{1}|{2}{3}", Layers[i].Start, Layers[i].End, Layers[i].Size, strEnd); 395 stringResult.AppendFormat("{0}|{1}|{2}{3}", Layers[i].Start, Layers[i].End, Layers[i].End - Layers[i].Start, strEnd);
395 } 396 }
396 fsSWCache.Write(stringResult.ToString()); 397 fsSWCache.Write(stringResult.ToString());
397 fsSWCache.Close(); 398 fsSWCache.Close();
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index 171add8..87f137e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
146 private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID) 146 private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID)
147 { 147 {
148 ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); 148 ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
149 if ((obj.landData.Flags & (uint)Parcel.ParcelFlags.AllowDamage) != 0) 149 if ((obj.landData.Flags & (uint)ParcelFlags.AllowDamage) != 0)
150 { 150 {
151 avatar.Invulnerable = false; 151 avatar.Invulnerable = false;
152 } 152 }
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 4c108f5..e385ae0 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -301,12 +301,12 @@ namespace OpenSim.Region.CoreModules.World.Land
301 { 301 {
302 if (checkBan.isBannedFromLand(avatar.AgentId)) 302 if (checkBan.isBannedFromLand(avatar.AgentId))
303 { 303 {
304 checkBan.sendLandProperties((int)ParcelStatus.CollisionBanned, false, (int)ParcelResult.Single, avatar); 304 checkBan.sendLandProperties((int)ParcelPropertiesStatus.CollisionBanned, false, (int)ParcelResult.Single, avatar);
305 return; //Only send one 305 return; //Only send one
306 } 306 }
307 if (checkBan.isRestrictedFromLand(avatar.AgentId)) 307 if (checkBan.isRestrictedFromLand(avatar.AgentId))
308 { 308 {
309 checkBan.sendLandProperties((int)ParcelStatus.CollisionNotOnAccessList, false, (int)ParcelResult.Single, avatar); 309 checkBan.sendLandProperties((int)ParcelPropertiesStatus.CollisionNotOnAccessList, false, (int)ParcelResult.Single, avatar);
310 return; //Only send one 310 return; //Only send one
311 } 311 }
312 } 312 }
@@ -1116,7 +1116,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1116 UUID pOwnerID = lob.landData.OwnerID; 1116 UUID pOwnerID = lob.landData.OwnerID;
1117 1117
1118 bool landforsale = ((lob.landData.Flags & 1118 bool landforsale = ((lob.landData.Flags &
1119 (uint)(Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects)) != 0); 1119 (uint)(ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects)) != 0);
1120 if ((AuthorizedID == UUID.Zero || AuthorizedID == e.agentId) && e.parcelPrice >= saleprice && landforsale) 1120 if ((AuthorizedID == UUID.Zero || AuthorizedID == e.agentId) && e.parcelPrice >= saleprice && landforsale)
1121 { 1121 {
1122 // TODO I don't think we have to lock it here, no? 1122 // TODO I don't think we have to lock it here, no?
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index b800bb3..715b48d 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -167,7 +167,7 @@ namespace OpenSim.Region.CoreModules.World.Land
167 167
168 // In a perfect world, this would have worked. 168 // In a perfect world, this would have worked.
169 // 169 //
170// if ((landData.Flags & (uint)Parcel.ParcelFlags.AllowLandmark) != 0) 170// if ((landData.Flags & (uint)ParcelFlags.AllowLandmark) != 0)
171// regionFlags |= (uint)RegionFlags.AllowLandmark; 171// regionFlags |= (uint)RegionFlags.AllowLandmark;
172// if (landData.OwnerID == remote_client.AgentId) 172// if (landData.OwnerID == remote_client.AgentId)
173// regionFlags |= (uint)RegionFlags.AllowSetHome; 173// regionFlags |= (uint)RegionFlags.AllowSetHome;
@@ -226,7 +226,7 @@ namespace OpenSim.Region.CoreModules.World.Land
226 newData.ClaimPrice = claimprice; 226 newData.ClaimPrice = claimprice;
227 newData.SalePrice = 0; 227 newData.SalePrice = 0;
228 newData.AuthBuyerID = UUID.Zero; 228 newData.AuthBuyerID = UUID.Zero;
229 newData.Flags &= ~(uint) (Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects); 229 newData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects);
230 m_scene.LandChannel.UpdateLandObject(landData.LocalID, newData); 230 m_scene.LandChannel.UpdateLandObject(landData.LocalID, newData);
231 231
232 sendLandUpdateToAvatarsOverMe(); 232 sendLandUpdateToAvatarsOverMe();
@@ -259,7 +259,7 @@ namespace OpenSim.Region.CoreModules.World.Land
259 259
260 public bool isBannedFromLand(UUID avatar) 260 public bool isBannedFromLand(UUID avatar)
261 { 261 {
262 if ((landData.Flags & (uint) Parcel.ParcelFlags.UseBanList) > 0) 262 if ((landData.Flags & (uint) ParcelFlags.UseBanList) > 0)
263 { 263 {
264 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); 264 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
265 entry.AgentID = avatar; 265 entry.AgentID = avatar;
@@ -276,7 +276,7 @@ namespace OpenSim.Region.CoreModules.World.Land
276 276
277 public bool isRestrictedFromLand(UUID avatar) 277 public bool isRestrictedFromLand(UUID avatar)
278 { 278 {
279 if ((landData.Flags & (uint) Parcel.ParcelFlags.UseAccessList) > 0) 279 if ((landData.Flags & (uint) ParcelFlags.UseAccessList) > 0)
280 { 280 {
281 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); 281 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
282 entry.AgentID = avatar; 282 entry.AgentID = avatar;
@@ -318,7 +318,7 @@ namespace OpenSim.Region.CoreModules.World.Land
318 { 318 {
319 if (over.landData.LocalID == landData.LocalID) 319 if (over.landData.LocalID == landData.LocalID)
320 { 320 {
321 if (((over.landData.Flags & (uint)Parcel.ParcelFlags.AllowDamage) != 0) && m_scene.RegionInfo.RegionSettings.AllowDamage) 321 if (((over.landData.Flags & (uint)ParcelFlags.AllowDamage) != 0) && m_scene.RegionInfo.RegionSettings.AllowDamage)
322 avatars[i].Invulnerable = false; 322 avatars[i].Invulnerable = false;
323 else 323 else
324 avatars[i].Invulnerable = true; 324 avatars[i].Invulnerable = true;
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 99035b6..5c0d3db 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -1186,7 +1186,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
1186 return false; 1186 return false;
1187 } 1187 }
1188 1188
1189 if ((land.landData.Flags & ((int)Parcel.ParcelFlags.AllowAPrimitiveEntry)) != 0) 1189 if ((land.landData.Flags & ((int)ParcelFlags.AllowAPrimitiveEntry)) != 0)
1190 { 1190 {
1191 return true; 1191 return true;
1192 } 1192 }
@@ -1230,8 +1230,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions
1230 ILandObject land = m_scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y); 1230 ILandObject land = m_scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
1231 if (land == null) return false; 1231 if (land == null) return false;
1232 1232
1233 if ((land.landData.Flags & ((int)Parcel.ParcelFlags.CreateObjects)) == 1233 if ((land.landData.Flags & ((int)ParcelFlags.CreateObjects)) ==
1234 (int)Parcel.ParcelFlags.CreateObjects) 1234 (int)ParcelFlags.CreateObjects)
1235 permission = true; 1235 permission = true;
1236 1236
1237 if (IsAdministrator(owner)) 1237 if (IsAdministrator(owner))
@@ -1357,7 +1357,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
1357 return false; 1357 return false;
1358 1358
1359 // Others allowed to terraform? 1359 // Others allowed to terraform?
1360 if ((parcel.landData.Flags & ((int)Parcel.ParcelFlags.AllowTerraform)) != 0) 1360 if ((parcel.landData.Flags & ((int)ParcelFlags.AllowTerraform)) != 0)
1361 return true; 1361 return true;
1362 1362
1363 // Land owner can terraform too 1363 // Land owner can terraform too
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
index fd6490e..005659f 100644
--- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
87 //Index sim land 87 //Index sim land
88 foreach (KeyValuePair<int, Land> curLand in m_scene.LandManager.landList) 88 foreach (KeyValuePair<int, Land> curLand in m_scene.LandManager.landList)
89 { 89 {
90 //if ((curLand.Value.landData.landFlags & (uint)Parcel.ParcelFlags.ShowDirectory) == (uint)Parcel.ParcelFlags.ShowDirectory) 90 //if ((curLand.Value.landData.landFlags & (uint)ParcelFlags.ShowDirectory) == (uint)ParcelFlags.ShowDirectory)
91 //{ 91 //{
92 m_landIndexed.Add(curLand.Key, curLand.Value.Copy()); 92 m_landIndexed.Add(curLand.Key, curLand.Value.Copy());
93 //} 93 //}
@@ -138,7 +138,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
138 LandData parcel = land.landData; 138 LandData parcel = land.landData;
139 if (m_parent.ExposureLevel.Equals("all") || 139 if (m_parent.ExposureLevel.Equals("all") ||
140 (m_parent.ExposureLevel.Equals("minimum") && 140 (m_parent.ExposureLevel.Equals("minimum") &&
141 (parcel.Flags & (uint)Parcel.ParcelFlags.ShowDirectory) == (uint)Parcel.ParcelFlags.ShowDirectory)) 141 (parcel.Flags & (uint)ParcelFlags.ShowDirectory) == (uint)ParcelFlags.ShowDirectory))
142 { 142 {
143 143
144 //TODO: make better method of marshalling data from LandData to XmlNode 144 //TODO: make better method of marshalling data from LandData to XmlNode
@@ -315,7 +315,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
315 315
316 private string GetScriptsPermissions(LandData parcel) 316 private string GetScriptsPermissions(LandData parcel)
317 { 317 {
318 if ((parcel.Flags & (uint)Parcel.ParcelFlags.AllowOtherScripts) == (uint)Parcel.ParcelFlags.AllowOtherScripts) 318 if ((parcel.Flags & (uint)ParcelFlags.AllowOtherScripts) == (uint)ParcelFlags.AllowOtherScripts)
319 return "true"; 319 return "true";
320 else 320 else
321 return "false"; 321 return "false";
@@ -324,7 +324,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
324 324
325 private string GetPublicPermissions(LandData parcel) 325 private string GetPublicPermissions(LandData parcel)
326 { 326 {
327 if ((parcel.Flags & (uint)Parcel.ParcelFlags.UseAccessList) == (uint)Parcel.ParcelFlags.UseAccessList) 327 if ((parcel.Flags & (uint)ParcelFlags.UseAccessList) == (uint)ParcelFlags.UseAccessList)
328 return "false"; 328 return "false";
329 else 329 else
330 return "true"; 330 return "true";
@@ -333,7 +333,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
333 333
334 private string GetBuildPermissions(LandData parcel) 334 private string GetBuildPermissions(LandData parcel)
335 { 335 {
336 if ((parcel.Flags & (uint)Parcel.ParcelFlags.CreateObjects) == (uint)Parcel.ParcelFlags.CreateObjects) 336 if ((parcel.Flags & (uint)ParcelFlags.CreateObjects) == (uint)ParcelFlags.CreateObjects)
337 return "true"; 337 return "true";
338 else 338 else
339 return "false"; 339 return "false";
@@ -342,7 +342,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
342 342
343 private string CheckForSale(LandData parcel) 343 private string CheckForSale(LandData parcel)
344 { 344 {
345 if ((parcel.Flags & (uint)Parcel.ParcelFlags.ForSale) == (uint)Parcel.ParcelFlags.ForSale) 345 if ((parcel.Flags & (uint)ParcelFlags.ForSale) == (uint)ParcelFlags.ForSale)
346 return "true"; 346 return "true";
347 else 347 else
348 return "false"; 348 return "false";
@@ -350,7 +350,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
350 350
351 private string GetShowInSearch(LandData parcel) 351 private string GetShowInSearch(LandData parcel)
352 { 352 {
353 if ((parcel.Flags & (uint)Parcel.ParcelFlags.ShowDirectory) == (uint)Parcel.ParcelFlags.ShowDirectory) 353 if ((parcel.Flags & (uint)ParcelFlags.ShowDirectory) == (uint)ParcelFlags.ShowDirectory)
354 return "true"; 354 return "true";
355 else 355 else
356 return "false"; 356 return "false";
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0b466f7..b48cf62 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3097,11 +3097,11 @@ namespace OpenSim.Region.Framework.Scenes
3097 { 3097 {
3098 if (parcel != null) 3098 if (parcel != null)
3099 { 3099 {
3100 if ((parcel.landData.Flags & (uint)Parcel.ParcelFlags.AllowOtherScripts) != 0) 3100 if ((parcel.landData.Flags & (uint)ParcelFlags.AllowOtherScripts) != 0)
3101 { 3101 {
3102 return true; 3102 return true;
3103 } 3103 }
3104 else if ((parcel.landData.Flags & (uint)Parcel.ParcelFlags.AllowGroupScripts) != 0) 3104 else if ((parcel.landData.Flags & (uint)ParcelFlags.AllowGroupScripts) != 0)
3105 { 3105 {
3106 if (part.OwnerID == parcel.landData.OwnerID 3106 if (part.OwnerID == parcel.landData.OwnerID
3107 || (parcel.landData.IsGroupOwned && part.GroupID == parcel.landData.GroupID) 3107 || (parcel.landData.IsGroupOwned && part.GroupID == parcel.landData.GroupID)
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index a2d8c65..f449e18 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -32,6 +32,7 @@ using System.Text.RegularExpressions;
32using System.Threading; 32using System.Threading;
33using log4net; 33using log4net;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenMetaverse.Assets;
35using OpenSim.Framework; 36using OpenSim.Framework;
36using OpenSim.Region.Framework.Scenes.Serialization; 37using OpenSim.Region.Framework.Scenes.Serialization;
37using OpenSim.Services.Interfaces; 38using OpenSim.Services.Interfaces;
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index de12b0a..5fa7efd 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -443,7 +443,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
443 // } 443 // }
444 // else 444 // else
445 445
446 if ((land.Flags & (uint)Parcel.ParcelFlags.AllowVoiceChat) == 0) 446 if ((land.Flags & (uint)ParcelFlags.AllowVoiceChat) == 0)
447 { 447 {
448 m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": voice not enabled for parcel", 448 m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": voice not enabled for parcel",
449 scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName); 449 scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName);
@@ -777,7 +777,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
777 // Create parcel voice channel. If no parcel exists, then the voice channel ID is the same 777 // Create parcel voice channel. If no parcel exists, then the voice channel ID is the same
778 // as the directory ID. Otherwise, it reflects the parcel's ID. 778 // as the directory ID. Otherwise, it reflects the parcel's ID.
779 779
780 if (land.LocalID != 1 && (land.Flags & (uint)Parcel.ParcelFlags.UseEstateVoiceChan) == 0) 780 if (land.LocalID != 1 && (land.Flags & (uint)ParcelFlags.UseEstateVoiceChan) == 0)
781 { 781 {
782 landName = String.Format("{0}:{1}", scene.RegionInfo.RegionName, land.Name); 782 landName = String.Format("{0}:{1}", scene.RegionInfo.RegionName, land.Name);
783 landUUID = land.GlobalID.ToString(); 783 landUUID = land.GlobalID.ToString();
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index 47309d0..5465678 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -651,7 +651,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
651 channel_uri = String.Empty; 651 channel_uri = String.Empty;
652 } 652 }
653 653
654 if ((land.Flags & (uint)Parcel.ParcelFlags.AllowVoiceChat) == 0) 654 if ((land.Flags & (uint)ParcelFlags.AllowVoiceChat) == 0)
655 { 655 {
656 m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": voice not enabled for parcel", 656 m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": voice not enabled for parcel",
657 scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName); 657 scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName);
@@ -722,7 +722,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
722 // Create parcel voice channel. If no parcel exists, then the voice channel ID is the same 722 // Create parcel voice channel. If no parcel exists, then the voice channel ID is the same
723 // as the directory ID. Otherwise, it reflects the parcel's ID. 723 // as the directory ID. Otherwise, it reflects the parcel's ID.
724 724
725 if (land.LocalID != 1 && (land.Flags & (uint)Parcel.ParcelFlags.UseEstateVoiceChan) == 0) 725 if (land.LocalID != 1 && (land.Flags & (uint)ParcelFlags.UseEstateVoiceChan) == 0)
726 { 726 {
727 landName = String.Format("{0}:{1}", scene.RegionInfo.RegionName, land.Name); 727 landName = String.Format("{0}:{1}", scene.RegionInfo.RegionName, land.Name);
728 landUUID = land.GlobalID.ToString(); 728 landUUID = land.GlobalID.ToString();
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs
index 208ddb0..5fac189 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenMetaverse.Assets;
30 31
31namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 32namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
32{ 33{
@@ -38,6 +39,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
38 { 39 {
39 int Type { get; } 40 int Type { get; }
40 UUID AssetID { get; } 41 UUID AssetID { get; }
41 T RetreiveAsset<T>() where T : OpenMetaverse.Asset, new(); 42 T RetreiveAsset<T>() where T : Asset, new();
42 } 43 }
43} 44}
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs
index b9c0065..40693ab 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs
@@ -32,6 +32,7 @@ using OpenSim.Framework;
32using OpenSim.Region.Framework.Scenes; 32using OpenSim.Region.Framework.Scenes;
33//using OpenSim.Services.AssetService; 33//using OpenSim.Services.AssetService;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenMetaverse.Assets;
35 36
36namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 37namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
37{ 38{
@@ -80,7 +81,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
80 public int Type { get { return m_privateItem.Type; } } 81 public int Type { get { return m_privateItem.Type; } }
81 public UUID AssetID { get { return m_privateItem.AssetID; } } 82 public UUID AssetID { get { return m_privateItem.AssetID; } }
82 83
83 public T RetreiveAsset<T>() where T : OpenMetaverse.Asset, new() 84 public T RetreiveAsset<T>() where T : OpenMetaverse.Assets.Asset, new()
84 { 85 {
85 AssetBase a = m_rootSceene.AssetService.Get(AssetID.ToString()); 86 AssetBase a = m_rootSceene.AssetService.Get(AssetID.ToString());
86 T result = new T(); 87 T result = new T();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 62c3fc2..2c3002a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -51,6 +51,8 @@ using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
51using OpenSim.Region.ScriptEngine.Interfaces; 51using OpenSim.Region.ScriptEngine.Interfaces;
52using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces; 52using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
53 53
54using AssetLandmark = OpenSim.Framework.AssetLandmark;
55
54using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat; 56using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
55using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; 57using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
56using LSL_Key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; 58using LSL_Key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
@@ -4058,7 +4060,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4058 else 4060 else
4059 { 4061 {
4060 // Parcel push restriction 4062 // Parcel push restriction
4061 if ((targetlandObj.landData.Flags & (uint)Parcel.ParcelFlags.RestrictPushObject) == (uint)Parcel.ParcelFlags.RestrictPushObject) 4063 if ((targetlandObj.landData.Flags & (uint)ParcelFlags.RestrictPushObject) == (uint)ParcelFlags.RestrictPushObject)
4062 { 4064 {
4063 // Need provisions for Group Owned here 4065 // Need provisions for Group Owned here
4064 if (m_host.OwnerID == targetlandObj.landData.OwnerID || targetlandObj.landData.IsGroupOwned || m_host.OwnerID == targetID) 4066 if (m_host.OwnerID == targetlandObj.landData.OwnerID || targetlandObj.landData.IsGroupOwned || m_host.OwnerID == targetID)
@@ -4066,7 +4068,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4066 pushAllowed = true; 4068 pushAllowed = true;
4067 } 4069 }
4068 4070
4069 //Parcel.ParcelFlags.RestrictPushObject 4071 //ParcelFlags.RestrictPushObject
4070 //pushAllowed = true; 4072 //pushAllowed = true;
4071 } 4073 }
4072 else 4074 else
diff --git a/OpenSim/Tools/pCampBot/PhysicsBot.cs b/OpenSim/Tools/pCampBot/PhysicsBot.cs
index 36a5ef6..426ef29 100644
--- a/OpenSim/Tools/pCampBot/PhysicsBot.cs
+++ b/OpenSim/Tools/pCampBot/PhysicsBot.cs
@@ -32,6 +32,7 @@ using System.IO;
32using System.Threading; 32using System.Threading;
33using System.Timers; 33using System.Timers;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenMetaverse.Assets;
35using Nini.Config; 36using Nini.Config;
36using OpenSim.Framework; 37using OpenSim.Framework;
37using OpenSim.Framework.Console; 38using OpenSim.Framework.Console;
@@ -142,7 +143,7 @@ namespace pCampBot
142 client.Settings.SEND_AGENT_THROTTLE = true; 143 client.Settings.SEND_AGENT_THROTTLE = true;
143 client.Settings.SEND_PINGS = true; 144 client.Settings.SEND_PINGS = true;
144 client.Settings.STORE_LAND_PATCHES = false; 145 client.Settings.STORE_LAND_PATCHES = false;
145 client.Settings.USE_TEXTURE_CACHE = false; 146 client.Settings.USE_ASSET_CACHE = false;
146 client.Settings.MULTIPLE_SIMS = true; 147 client.Settings.MULTIPLE_SIMS = true;
147 client.Throttle.Asset = 100000; 148 client.Throttle.Asset = 100000;
148 client.Throttle.Land = 100000; 149 client.Throttle.Land = 100000;
@@ -154,8 +155,7 @@ namespace pCampBot
154 client.Network.OnSimConnected += new NetworkManager.SimConnectedCallback(this.Network_OnConnected); 155 client.Network.OnSimConnected += new NetworkManager.SimConnectedCallback(this.Network_OnConnected);
155 client.Network.OnDisconnected += new NetworkManager.DisconnectedCallback(this.Network_OnDisconnected); 156 client.Network.OnDisconnected += new NetworkManager.DisconnectedCallback(this.Network_OnDisconnected);
156 client.Objects.OnNewPrim += Objects_NewPrim; 157 client.Objects.OnNewPrim += Objects_NewPrim;
157 client.Assets.OnImageReceived += Asset_TextureCallback; 158 //client.Assets.OnAssetReceived += Asset_ReceivedCallback;
158 client.Assets.OnAssetReceived += Asset_ReceivedCallback;
159 if (client.Network.Login(firstname, lastname, password, "pCampBot", "Your name")) 159 if (client.Network.Login(firstname, lastname, password, "pCampBot", "Your name"))
160 { 160 {
161 if (OnConnected != null) 161 if (OnConnected != null)
@@ -202,8 +202,8 @@ namespace pCampBot
202 UUID wearable = client.Appearance.GetWearableAsset(wtype); 202 UUID wearable = client.Appearance.GetWearableAsset(wtype);
203 if (wearable != UUID.Zero) 203 if (wearable != UUID.Zero)
204 { 204 {
205 client.Assets.RequestAsset(wearable, AssetType.Clothing, false); 205 client.Assets.RequestAsset(wearable, AssetType.Clothing, false, Asset_ReceivedCallback);
206 client.Assets.RequestAsset(wearable, AssetType.Bodypart, false); 206 client.Assets.RequestAsset(wearable, AssetType.Bodypart, false, Asset_ReceivedCallback);
207 } 207 }
208 } 208 }
209 } 209 }
@@ -377,7 +377,7 @@ namespace pCampBot
377 { 377 {
378 if (prim.Textures.DefaultTexture.TextureID != UUID.Zero) 378 if (prim.Textures.DefaultTexture.TextureID != UUID.Zero)
379 { 379 {
380 client.Assets.RequestImage(prim.Textures.DefaultTexture.TextureID, ImageType.Normal); 380 client.Assets.RequestImage(prim.Textures.DefaultTexture.TextureID, ImageType.Normal, Asset_TextureCallback_Texture);
381 } 381 }
382 for (int i = 0; i < prim.Textures.FaceTextures.Length; i++) 382 for (int i = 0; i < prim.Textures.FaceTextures.Length; i++)
383 { 383 {
@@ -385,7 +385,7 @@ namespace pCampBot
385 { 385 {
386 if (prim.Textures.FaceTextures[i].TextureID != UUID.Zero) 386 if (prim.Textures.FaceTextures[i].TextureID != UUID.Zero)
387 { 387 {
388 client.Assets.RequestImage(prim.Textures.FaceTextures[i].TextureID, ImageType.Normal); 388 client.Assets.RequestImage(prim.Textures.FaceTextures[i].TextureID, ImageType.Normal, Asset_TextureCallback_Texture);
389 } 389 }
390 390
391 } 391 }
@@ -393,16 +393,18 @@ namespace pCampBot
393 } 393 }
394 if (prim.Sculpt.SculptTexture != UUID.Zero) 394 if (prim.Sculpt.SculptTexture != UUID.Zero)
395 { 395 {
396 client.Assets.RequestImage(prim.Sculpt.SculptTexture, ImageType.Normal); 396 client.Assets.RequestImage(prim.Sculpt.SculptTexture, ImageType.Normal, Asset_TextureCallback_Texture);
397 } 397 }
398 } 398 }
399 399
400 } 400 }
401 public void Asset_TextureCallback(ImageDownload image, AssetTexture asset) 401
402
403 public void Asset_TextureCallback_Texture(TextureRequestState state, AssetTexture assetTexture)
402 { 404 {
403 //TODO: Implement texture saving and applying 405 //TODO: Implement texture saving and applying
404 } 406 }
405 407
406 public void Asset_ReceivedCallback(AssetDownload transfer,Asset asset) 408 public void Asset_ReceivedCallback(AssetDownload transfer,Asset asset)
407 { 409 {
408 if (wear == "save") 410 if (wear == "save")
generated by cgit v1.1 at 2024-11-06 03:26:29 +0000