diff options
author | mingchen | 2007-07-13 23:13:25 +0000 |
---|---|---|
committer | mingchen | 2007-07-13 23:13:25 +0000 |
commit | d879c6e8fc613b75220b224b3bdf07da653c9d2c (patch) | |
tree | bfd658e1e8378c3b20d15368254dbeeef619777f /OpenSim/Framework | |
parent | *Reworked parcel joining to work the same way as LL's method. (diff) | |
download | opensim-SC-d879c6e8fc613b75220b224b3bdf07da653c9d2c.zip opensim-SC-d879c6e8fc613b75220b224b3bdf07da653c9d2c.tar.gz opensim-SC-d879c6e8fc613b75220b224b3bdf07da653c9d2c.tar.bz2 opensim-SC-d879c6e8fc613b75220b224b3bdf07da653c9d2c.tar.xz |
*Moved the OnSignificantClientMovement event to ScenePresence.
*ParcelManager's resetSimParcels does not set any default values.
*Updated ParcelData with correct defaults previously set in resetSimParcels
*Region overrides are now sent to viewer instead of dummy'd
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/General/Interfaces/IClientAPI.cs | 5 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/ParcelData.cs | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs index 555f46e..fbd239f 100644 --- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs +++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs | |||
@@ -77,7 +77,7 @@ namespace OpenSim.Framework.Interfaces | |||
77 | 77 | ||
78 | public delegate void AddNewPrim(LLUUID ownerID, LLVector3 pos, PrimitiveBaseShape shape); | 78 | public delegate void AddNewPrim(LLUUID ownerID, LLVector3 pos, PrimitiveBaseShape shape); |
79 | 79 | ||
80 | public delegate void SignificantClientMovement(IClientAPI remote_client); | 80 | |
81 | 81 | ||
82 | public interface IClientAPI | 82 | public interface IClientAPI |
83 | { | 83 | { |
@@ -128,7 +128,6 @@ namespace OpenSim.Framework.Interfaces | |||
128 | event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest; | 128 | event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest; |
129 | 129 | ||
130 | event EstateOwnerMessageRequest OnEstateOwnerMessage; | 130 | event EstateOwnerMessageRequest OnEstateOwnerMessage; |
131 | event SignificantClientMovement OnSignificantClientMovement; | ||
132 | 131 | ||
133 | LLVector3 StartPos | 132 | LLVector3 StartPos |
134 | { | 133 | { |
@@ -187,6 +186,6 @@ namespace OpenSim.Framework.Interfaces | |||
187 | void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item); | 186 | void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item); |
188 | void SendNameReply(LLUUID profileId, string firstname, string lastname); | 187 | void SendNameReply(LLUUID profileId, string firstname, string lastname); |
189 | 188 | ||
190 | void TriggerSignificantClientMovement(IClientAPI remote_client); | 189 | |
191 | } | 190 | } |
192 | } | 191 | } |
diff --git a/OpenSim/Framework/General/Types/ParcelData.cs b/OpenSim/Framework/General/Types/ParcelData.cs index dbb42a3..ac34a26 100644 --- a/OpenSim/Framework/General/Types/ParcelData.cs +++ b/OpenSim/Framework/General/Types/ParcelData.cs | |||
@@ -33,7 +33,7 @@ namespace OpenSim.Framework.Types | |||
33 | public class ParcelData | 33 | public class ParcelData |
34 | { | 34 | { |
35 | public byte[] parcelBitmapByteArray = new byte[512]; | 35 | public byte[] parcelBitmapByteArray = new byte[512]; |
36 | public string parcelName = ""; | 36 | public string parcelName = "Your Parcel"; |
37 | public string parcelDesc = ""; | 37 | public string parcelDesc = ""; |
38 | public LLUUID ownerID = new LLUUID(); | 38 | public LLUUID ownerID = new LLUUID(); |
39 | public bool isGroupOwned = false; | 39 | public bool isGroupOwned = false; |
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Types | |||
48 | public LLUUID groupID = new LLUUID(); //Unemplemented | 48 | public LLUUID groupID = new LLUUID(); //Unemplemented |
49 | public int groupPrims = 0; //Unemplemented | 49 | public int groupPrims = 0; //Unemplemented |
50 | public int salePrice = 0; //Unemeplemented. Parcels price. | 50 | public int salePrice = 0; //Unemeplemented. Parcels price. |
51 | public Parcel.ParcelStatus parcelStatus = Parcel.ParcelStatus.None; | 51 | public Parcel.ParcelStatus parcelStatus = Parcel.ParcelStatus.Leased; |
52 | public uint parcelFlags = (uint)Parcel.ParcelFlags.AllowFly | (uint)Parcel.ParcelFlags.AllowLandmark | (uint)Parcel.ParcelFlags.AllowAllObjectEntry | (uint)Parcel.ParcelFlags.AllowDeedToGroup | (uint)Parcel.ParcelFlags.AllowTerraform | (uint)Parcel.ParcelFlags.CreateObjects | (uint)Parcel.ParcelFlags.AllowOtherScripts; | 52 | public uint parcelFlags = (uint)Parcel.ParcelFlags.AllowFly | (uint)Parcel.ParcelFlags.AllowLandmark | (uint)Parcel.ParcelFlags.AllowAllObjectEntry | (uint)Parcel.ParcelFlags.AllowDeedToGroup | (uint)Parcel.ParcelFlags.AllowTerraform | (uint)Parcel.ParcelFlags.CreateObjects | (uint)Parcel.ParcelFlags.AllowOtherScripts; |
53 | public byte landingType = 0; | 53 | public byte landingType = 0; |
54 | public byte mediaAutoScale = 0; | 54 | public byte mediaAutoScale = 0; |