3 files changed, 80 insertions, 3 deletions

diff --git a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
index 1b3e70d..038c591 100644
--- a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
@@ -163,8 +163,11 @@ namespace OpenSim.Framework.Communications.Cache
                                                                 passwordIterations);
 
                 // Use the password to generate pseudo-random bytes for the encryption
-                // key. Specify the size of the key in bytes (instead of bits).
+                // key. Specify the size of the key in bytes (instead
+                // of bits).
+                #pragma warning disable 0618
                 byte[] keyBytes = password.GetBytes(keySize / 8);
+                #pragma warning restore 0618
 
                 // Create uninitialized Rijndael encryption object.
                 RijndaelManaged symmetricKey = new RijndaelManaged();
@@ -276,8 +279,11 @@ namespace OpenSim.Framework.Communications.Cache
                                                                        passwordIterations);
 
                 // Use the password to generate pseudo-random bytes for the encryption
-                // key. Specify the size of the key in bytes (instead of bits).
+                // key. Specify the size of the key in bytes (instead
+                // of bits).
+                #pragma warning disable 0618
                 byte[] keyBytes = password.GetBytes(keySize / 8);
+                #pragma warning restore 0618
 
                 // Create uninitialized Rijndael encryption object.
                 RijndaelManaged symmetricKey = new RijndaelManaged();
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index a370eea..25a69f7 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -35,7 +35,7 @@ using log4net;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework;
-using OpenSim.Region.Interfaces;
+// using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Framework.Communications.Capabilities
 {
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
new file mode 100644
index 0000000..7904e94
--- /dev/null
+++ b/OpenSim/Framework/IMoneyModule.cs
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using OpenSim.Framework;
+using OpenMetaverse;
+
+namespace OpenSim.Framework
+{
+    public delegate void ObjectPaid(UUID objectID, UUID agentID, int amount);
+    public interface IMoneyModule
+    {
+        bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID,
+                int amount);
+
+        int GetBalance(IClientAPI client);
+        void ApplyUploadCharge(UUID agentID);
+        bool UploadCovered(IClientAPI client);
+        void ApplyGroupCreationCharge(UUID agentID);
+        bool GroupCreationCovered(IClientAPI client);
+        bool AmountCovered(IClientAPI client, int amount);
+        void ApplyCharge(UUID agentID, int amount, string text);
+
+        EconomyData GetEconomyData();
+
+        event ObjectPaid OnObjectPaid;
+    }
+
+    public struct EconomyData
+    {
+        public int ObjectCapacity;
+        public int ObjectCount;
+        public int PriceEnergyUnit;
+        public int PriceGroupCreate;
+        public int PriceObjectClaim;
+        public float PriceObjectRent;
+        public float PriceObjectScaleFactor;
+        public int PriceParcelClaim;
+        public float PriceParcelClaimFactor;
+        public int PriceParcelRent;
+        public int PricePublicObjectDecay;
+        public int PricePublicObjectDelete;
+        public int PriceRentLight;
+        public int PriceUpload;
+        public int TeleportMinPrice;
+    }
+}