aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/LandManagement
diff options
context:
space:
mode:
authorTeravus Ovares2008-04-17 19:42:54 +0000
committerTeravus Ovares2008-04-17 19:42:54 +0000
commitdd4deebbcbe07cccf8ce700c29c9884f1f414c85 (patch)
treee5df5e61c84e800d5d38db3b72209d1bc2764959 /OpenSim/Region/Environment/Modules/LandManagement
parent* Acks the first UseCircuitCode packet (diff)
downloadopensim-SC_OLD-dd4deebbcbe07cccf8ce700c29c9884f1f414c85.zip
opensim-SC_OLD-dd4deebbcbe07cccf8ce700c29c9884f1f414c85.tar.gz
opensim-SC_OLD-dd4deebbcbe07cccf8ce700c29c9884f1f414c85.tar.bz2
opensim-SC_OLD-dd4deebbcbe07cccf8ce700c29c9884f1f414c85.tar.xz
* Re-Fixed caps
* This fixes chi11ken's/OpenViewer's libsl cap issue.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/LandManagement')
-rw-r--r--OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs17
-rw-r--r--OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs2
2 files changed, 15 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs
index a46895e..e3b7cf5 100644
--- a/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs
+++ b/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs
@@ -953,8 +953,12 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
953 } 953 }
954 } 954 }
955 955
956 // If the economy has been validated by the economy module,
957 // and land has been validated as well, this method transfers
958 // the land ownership
959
956 public void handleLandBuyRequest(Object o, LandBuyArgs e) 960 public void handleLandBuyRequest(Object o, LandBuyArgs e)
957 { 961 {
958 if (e.economyValidated && e.landValidated) 962 if (e.economyValidated && e.landValidated)
959 { 963 {
960 lock (landList) 964 lock (landList)
@@ -966,7 +970,15 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
966 } 970 }
967 } 971 }
968 } 972 }
969 else if (e.landValidated == false) 973 }
974
975 // After receiving a land buy packet, first the data needs to
976 // be validated. This method validates the right to buy the
977 // parcel
978
979 public void handleLandValidationRequest(Object o, LandBuyArgs e)
980 {
981 if (e.landValidated == false)
970 { 982 {
971 ILandObject lob = null; 983 ILandObject lob = null;
972 lock (landList) 984 lock (landList)
@@ -994,7 +1006,6 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
994 1006
995 } 1007 }
996 } 1008 }
997 m_scene.EventManager.TriggerValidatedLandBuy(this, e);
998 } 1009 }
999 } 1010 }
1000 } 1011 }
diff --git a/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs
index 6b2de47..20f75df 100644
--- a/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs
@@ -55,8 +55,8 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
55 m_scene.EventManager.OnParcelPrimCountUpdate += landChannel.updateLandPrimCounts; 55 m_scene.EventManager.OnParcelPrimCountUpdate += landChannel.updateLandPrimCounts;
56 m_scene.EventManager.OnAvatarEnteringNewParcel += new EventManager.AvatarEnteringNewParcel(landChannel.handleAvatarChangingParcel); 56 m_scene.EventManager.OnAvatarEnteringNewParcel += new EventManager.AvatarEnteringNewParcel(landChannel.handleAvatarChangingParcel);
57 m_scene.EventManager.OnClientMovement += new EventManager.ClientMovement(landChannel.handleAnyClientMovement); 57 m_scene.EventManager.OnClientMovement += new EventManager.ClientMovement(landChannel.handleAnyClientMovement);
58 m_scene.EventManager.OnValidateLandBuy += landChannel.handleLandValidationRequest;
58 m_scene.EventManager.OnLandBuy += landChannel.handleLandBuyRequest; 59 m_scene.EventManager.OnLandBuy += landChannel.handleLandBuyRequest;
59 m_scene.EventManager.OnValidatedLandBuy += landChannel.handleLandBuyRequest;
60 60
61 lock (m_scene) 61 lock (m_scene)
62 { 62 {