Adjustments for OpenSim 0.7.1 (use previous versions for OpenSim 0.7 …

…or 0.6.9)

addon-modules/mod-paypal/PayPalModule.cs

@@ -1046,99 +1046,49 @@ public bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, int amount)
             return false; // Objects cant give PP Money. (in theory it's doable however, if the user is in the sim.)
         }
 
-        public event ObjectPaid OnObjectPaid;
-
-
         // This will be the maximum amount the user
         // is able to spend due to client limitations.
         // It is set to the equivilent of US$10K
         // as this is PayPal's maximum transaction
         // size.
         //
         // This is 1 Million cents.
-        public int GetBalance(IClientAPI client)
+        public int GetBalance(UUID agentID)
         {
             return 1000000;
         }
 
-        public void ApplyUploadCharge(UUID agentID)
+        public bool UploadCovered(IClientAPI client, int amount)
         {
-            // N/A
+            return true;
         }
 
-        public bool UploadCovered(IClientAPI client)
+        public bool AmountCovered(IClientAPI client, int amount)
         {
             return true;
         }
 
-        public void ApplyGroupCreationCharge(UUID agentID)
+        public void ApplyCharge(UUID agentID, int amount, string text)
         {
             // N/A
         }
 
-        public bool GroupCreationCovered(IClientAPI client)
+        public void ApplyUploadCharge(UUID agentID, int amount, string text)
         {
-            return true;
+            // N/A
         }
 
-        public bool AmountCovered(IClientAPI client, int amount)
+        public int UploadCharge
         {
-            return true;
+            get { return 0; }
         }
 
-        public void ApplyCharge(UUID agentID, int amount, string text)
+        public int GroupCreationCharge
         {
-            // N/A
+            get { return 0; }
         }
 
-
-
-
-        /// <summary>
-        /// Old Pre-1.2 Linden Lab Economy Data
-        /// Completely irrelevant now.
-        /// (hooray for 7 year old cruft!)
-        /// 
-        /// We should probably hard-code this
-        /// into LLClientView TBH. -Adam
-        /// </summary>
-        /// <returns></returns>
-        public EconomyData GetEconomyData()
-        {
-            const int ObjectCapacity = 45000;
-            const int ObjectCount = 0;
-            const int PriceEnergyUnit = 0;
-            const int PriceGroupCreate = 0;
-            const int PriceObjectClaim = 0;
-            const float PriceObjectRent = 0f;
-            const float PriceObjectScaleFactor = 0f;
-            const int PriceParcelClaim = 0;
-            const float PriceParcelClaimFactor = 0f;
-            const int PriceParcelRent = 0;
-            const int PricePublicObjectDecay = 0;
-            const int PricePublicObjectDelete = 0;
-            const int PriceRentLight = 0;
-            const int PriceUpload = 0;
-            const int TeleportMinPrice = 0;
-
-            EconomyData edata = new EconomyData();
-            edata.ObjectCapacity = ObjectCapacity;
-            edata.ObjectCount = ObjectCount;
-            edata.PriceEnergyUnit = PriceEnergyUnit;
-            edata.PriceGroupCreate = PriceGroupCreate;
-            edata.PriceObjectClaim = PriceObjectClaim;
-            edata.PriceObjectRent = PriceObjectRent;
-            edata.PriceObjectScaleFactor = PriceObjectScaleFactor;
-            edata.PriceParcelClaim = PriceParcelClaim;
-            edata.PriceParcelClaimFactor = PriceParcelClaimFactor;
-            edata.PriceParcelRent = PriceParcelRent;
-            edata.PricePublicObjectDecay = PricePublicObjectDecay;
-            edata.PricePublicObjectDelete = PricePublicObjectDelete;
-            edata.PriceRentLight = PriceRentLight;
-            edata.PriceUpload = PriceUpload;
-            edata.TeleportMinPrice = TeleportMinPrice;
-            return edata;
-        }
+        public event ObjectPaid OnObjectPaid;
 
         #endregion