* Re-Fixed caps

* This fixes chi11ken's/OpenViewer's libsl cap issue.

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
             }
         }
 
+                // If the economy has been validated by the economy module,
+                // and land has been validated as well, this method transfers
+                // the land ownership
+
         public void handleLandBuyRequest(Object o, LandBuyArgs e)
-        {
+                {
             if (e.economyValidated && e.landValidated)
             {
                 lock (landList)
@@ -966,7 +970,15 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
                     }
                 }
             }
-            else if (e.landValidated == false)
+                }
+
+                // After receiving a land buy packet, first the data needs to
+                // be validated. This method validates the right to buy the
+                // parcel
+
+        public void handleLandValidationRequest(Object o, LandBuyArgs e)
+        {
+            if (e.landValidated == false)
             {
                 ILandObject lob = null;
                 lock (landList)
@@ -994,7 +1006,6 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
                         
                     }
                 }
-                m_scene.EventManager.TriggerValidatedLandBuy(this, e);
             }
         }
     }
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
             m_scene.EventManager.OnParcelPrimCountUpdate += landChannel.updateLandPrimCounts;
             m_scene.EventManager.OnAvatarEnteringNewParcel += new EventManager.AvatarEnteringNewParcel(landChannel.handleAvatarChangingParcel);
             m_scene.EventManager.OnClientMovement += new EventManager.ClientMovement(landChannel.handleAnyClientMovement);
+            m_scene.EventManager.OnValidateLandBuy += landChannel.handleLandValidationRequest;
             m_scene.EventManager.OnLandBuy += landChannel.handleLandBuyRequest;
-            m_scene.EventManager.OnValidatedLandBuy += landChannel.handleLandBuyRequest;
 
             lock (m_scene)
             {