aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authormingchen2007-07-13 23:13:25 +0000
committermingchen2007-07-13 23:13:25 +0000
commitd879c6e8fc613b75220b224b3bdf07da653c9d2c (patch)
treebfd658e1e8378c3b20d15368254dbeeef619777f
parent*Reworked parcel joining to work the same way as LL's method. (diff)
downloadopensim-SC_OLD-d879c6e8fc613b75220b224b3bdf07da653c9d2c.zip
opensim-SC_OLD-d879c6e8fc613b75220b224b3bdf07da653c9d2c.tar.gz
opensim-SC_OLD-d879c6e8fc613b75220b224b3bdf07da653c9d2c.tar.bz2
opensim-SC_OLD-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 '')
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs5
-rw-r--r--OpenSim/Framework/General/Types/ParcelData.cs4
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs10
-rw-r--r--OpenSim/Region/Environment/ParcelManager.cs20
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs11
6 files changed, 20 insertions, 31 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;
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index df5a853..b368ab7 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -87,8 +87,6 @@ namespace OpenSim.Region.ClientStack
87 87
88 public event EstateOwnerMessageRequest OnEstateOwnerMessage; 88 public event EstateOwnerMessageRequest OnEstateOwnerMessage;
89 89
90 public event SignificantClientMovement OnSignificantClientMovement;
91
92 /// <summary> 90 /// <summary>
93 /// 91 ///
94 /// </summary> 92 /// </summary>
@@ -1178,13 +1176,5 @@ namespace OpenSim.Region.ClientStack
1178 1176
1179 OutPacket( packet ); 1177 OutPacket( packet );
1180 } 1178 }
1181
1182 public void TriggerSignificantClientMovement(IClientAPI remote_client)
1183 {
1184 if (OnSignificantClientMovement != null)
1185 {
1186 OnSignificantClientMovement(remote_client);
1187 }
1188 }
1189 } 1179 }
1190} 1180}
diff --git a/OpenSim/Region/Environment/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
index 125ba19..07f39fd 100644
--- a/OpenSim/Region/Environment/ParcelManager.cs
+++ b/OpenSim/Region/Environment/ParcelManager.cs
@@ -481,13 +481,7 @@ namespace OpenSim.Region.Environment
481 Parcel fullSimParcel = new Parcel(LLUUID.Zero, false, m_world); 481 Parcel fullSimParcel = new Parcel(LLUUID.Zero, false, m_world);
482 482
483 fullSimParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(0, 0, 256, 256)); 483 fullSimParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(0, 0, 256, 256));
484 fullSimParcel.parcelData.parcelName = "Your Sim Parcel";
485 fullSimParcel.parcelData.parcelDesc = "";
486 fullSimParcel.parcelData.ownerID = m_regInfo.MasterAvatarAssignedUUID; 484 fullSimParcel.parcelData.ownerID = m_regInfo.MasterAvatarAssignedUUID;
487 fullSimParcel.parcelData.salePrice = 1;
488
489 fullSimParcel.parcelData.parcelFlags |=(uint)libsecondlife.Parcel.ParcelFlags.ForSale;
490 fullSimParcel.parcelData.parcelStatus = libsecondlife.Parcel.ParcelStatus.Leased;
491 485
492 addParcel(fullSimParcel); 486 addParcel(fullSimParcel);
493 487
@@ -611,16 +605,16 @@ namespace OpenSim.Region.Environment
611 updatePacket.ParcelData.OtherPrims = 0; //unemplented 605 updatePacket.ParcelData.OtherPrims = 0; //unemplented
612 updatePacket.ParcelData.OwnerID = parcelData.ownerID; 606 updatePacket.ParcelData.OwnerID = parcelData.ownerID;
613 updatePacket.ParcelData.OwnerPrims = 0; //unemplemented 607 updatePacket.ParcelData.OwnerPrims = 0; //unemplemented
614 updatePacket.ParcelData.ParcelFlags = parcelData.parcelFlags; //unemplemented 608 updatePacket.ParcelData.ParcelFlags = parcelData.parcelFlags;
615 updatePacket.ParcelData.ParcelPrimBonus = (float)1.0; //unemplemented 609 updatePacket.ParcelData.ParcelPrimBonus = m_world.RegionInfo.estateSettings.objectBonusFactor;
616 updatePacket.ParcelData.PassHours = parcelData.passHours; 610 updatePacket.ParcelData.PassHours = parcelData.passHours;
617 updatePacket.ParcelData.PassPrice = parcelData.passPrice; 611 updatePacket.ParcelData.PassPrice = parcelData.passPrice;
618 updatePacket.ParcelData.PublicCount = 0; //unemplemented 612 updatePacket.ParcelData.PublicCount = 0; //unemplemented
619 updatePacket.ParcelData.RegionDenyAnonymous = false; //unemplemented 613 updatePacket.ParcelData.RegionDenyAnonymous = (((uint)m_world.RegionInfo.estateSettings.regionFlags & (uint)Simulator.RegionFlags.DenyAnonymous) > 0);
620 updatePacket.ParcelData.RegionDenyIdentified = false; //unemplemented 614 updatePacket.ParcelData.RegionDenyIdentified = (((uint)m_world.RegionInfo.estateSettings.regionFlags & (uint)Simulator.RegionFlags.DenyIdentified) > 0);
621 updatePacket.ParcelData.RegionDenyTransacted = false; //unemplemented 615 updatePacket.ParcelData.RegionDenyTransacted = (((uint)m_world.RegionInfo.estateSettings.regionFlags & (uint)Simulator.RegionFlags.DenyTransacted) > 0);
622 updatePacket.ParcelData.RegionPushOverride = true; //unemplemented 616 updatePacket.ParcelData.RegionPushOverride = (((uint)m_world.RegionInfo.estateSettings.regionFlags & (uint)Simulator.RegionFlags.RestrictPushObject) > 0);
623 updatePacket.ParcelData.RentPrice = 0; //?? 617 updatePacket.ParcelData.RentPrice = 0;
624 updatePacket.ParcelData.RequestResult = request_result; 618 updatePacket.ParcelData.RequestResult = request_result;
625 updatePacket.ParcelData.SalePrice = parcelData.salePrice; //unemplemented 619 updatePacket.ParcelData.SalePrice = parcelData.salePrice; //unemplemented
626 updatePacket.ParcelData.SelectedPrims = 0; //unemeplemented 620 updatePacket.ParcelData.SelectedPrims = 0; //unemeplemented
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 7098c38..318b025 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -485,7 +485,6 @@ namespace OpenSim.Region.Environment.Scenes
485 client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest); 485 client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);
486 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage); 486 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
487 487
488 client.OnSignificantClientMovement += new SignificantClientMovement(parcelManager.handleSignificantClientMovement);
489 } 488 }
490 489
491 protected void CreateAndAddScenePresence(IClientAPI client) 490 protected void CreateAndAddScenePresence(IClientAPI client)
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 613ad52..8559caf 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -81,6 +81,10 @@ namespace OpenSim.Region.Environment.Scenes
81 /// Position at which a significant movement was made 81 /// Position at which a significant movement was made
82 /// </summary> 82 /// </summary>
83 private LLVector3 posLastSignificantMove = new LLVector3(); 83 private LLVector3 posLastSignificantMove = new LLVector3();
84
85 public delegate void SignificantClientMovement(IClientAPI remote_client);
86 public event SignificantClientMovement OnSignificantClientMovement;
87
84 #region Properties 88 #region Properties
85 /// <summary> 89 /// <summary>
86 /// 90 ///
@@ -147,7 +151,7 @@ namespace OpenSim.Region.Environment.Scenes
147 // ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack); 151 // ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);
148 // ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange); 152 // ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
149 //ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement); 153 //ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);
150 154 OnSignificantClientMovement += new SignificantClientMovement(m_world.parcelManager.handleSignificantClientMovement);
151 Dir_Vectors[0] = new Vector3(1, 0, 0); //FOWARD 155 Dir_Vectors[0] = new Vector3(1, 0, 0); //FOWARD
152 Dir_Vectors[1] = new Vector3(-1, 0, 0); //BACK 156 Dir_Vectors[1] = new Vector3(-1, 0, 0); //BACK
153 Dir_Vectors[2] = new Vector3(0, 1, 0); //LEFT 157 Dir_Vectors[2] = new Vector3(0, 1, 0); //LEFT
@@ -479,7 +483,10 @@ namespace OpenSim.Region.Environment.Scenes
479 if (libsecondlife.Helpers.VecDist(this.Pos, this.posLastSignificantMove) > 2.0) 483 if (libsecondlife.Helpers.VecDist(this.Pos, this.posLastSignificantMove) > 2.0)
480 { 484 {
481 this.posLastSignificantMove = this.Pos; 485 this.posLastSignificantMove = this.Pos;
482 this.ControllingClient.TriggerSignificantClientMovement(this.ControllingClient); 486 if (OnSignificantClientMovement != null)
487 {
488 OnSignificantClientMovement(this.ControllingClient);
489 }
483 } 490 }
484 } 491 }
485 #endregion 492 #endregion