From 682f4e9257bcec6e9690145760558cc3331bc5d8 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Tue, 15 Apr 2008 06:21:44 +0000
Subject: * Fixes an issue with the BaseHttpServer in Linux * Fixes an estate
 naming issue * Fixes a land issue with the landobject not reporting the
 proper parcel prim. * A few other tweaks.

---
 .../Environment/Modules/BetaGridLikeMoneyModule.cs | 44 ++++++++++++++++++++++
 .../Modules/LandManagement/LandObject.cs           |  6 +--
 2 files changed, 47 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Environment/Modules')

diff --git a/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs b/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
index d950af9..aef0f81 100644
--- a/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
@@ -144,6 +144,7 @@ namespace OpenSim.Region.Environment.Modules
                            // Centralized grid structure using OpenSimWi Redux revision 9+
                            // https://opensimwiredux.svn.sourceforge.net/svnroot/opensimwiredux
                            scene.AddXmlRPCHandler("dynamic_balance_update_request", GridMoneyUpdate);
+                           scene.AddXmlRPCHandler("user_alert", UserAlert);
                        }
                        else
                        {
@@ -1164,6 +1165,49 @@ namespace OpenSim.Region.Environment.Modules
             r.Value = rparms;
             return r;
         }
+        /// <summary>
+        /// XMLRPC handler to send alert message and sound to client
+        /// </summary>
+        public XmlRpcResponse UserAlert(XmlRpcRequest request)
+		{
+            XmlRpcResponse ret = new XmlRpcResponse();
+            Hashtable retparam = new Hashtable();
+            Hashtable requestData = (Hashtable)request.Params[0];
+
+            LLUUID agentId = LLUUID.Zero;
+            LLUUID soundId = LLUUID.Zero;
+
+			Helpers.TryParse((string)requestData["agentId"], out agentId);
+			Helpers.TryParse((string)requestData["soundId"], out soundId);
+			string text=(string)requestData["text"];
+			string secret=(string)requestData["secret"];
+
+			Scene userScene = GetRandomScene();
+			if(userScene.RegionInfo.regionSecret.ToString() == secret)
+			{
+				IClientAPI client = LocateClientObject(agentId);
+
+				if (client != null)
+				{
+					if(soundId != LLUUID.Zero)
+						client.SendPlayAttachedSound(soundId, LLUUID.Zero, LLUUID.Zero, 1.0f, 0);
+					client.SendBlueBoxMessage(LLUUID.Zero, LLUUID.Zero, "", text);
+					retparam.Add("success", true);
+				}
+				else
+				{
+					retparam.Add("success", false);
+				}
+			}
+			else
+			{
+				retparam.Add("success", false);
+			}
+            ret.Value = retparam;
+
+            return ret;
+		}
+
 
 # region Standalone box enablers only
 
diff --git a/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
index 161434e..69d3c05 100644
--- a/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
@@ -172,7 +172,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
             {
                 updatePacket.ParcelData.MaxPrims =
                     Convert.ToInt32(
-                        Math.Round((Convert.ToDecimal(landData.area)/Convert.ToDecimal(65536))*15000*
+                        Math.Round((Convert.ToDecimal(landData.area)/Convert.ToDecimal(65536))*m_scene.objectCapacity*
                                    Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor)));
             }
             else
@@ -194,7 +194,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
             updatePacket.ParcelData.PassHours = landData.passHours;
             updatePacket.ParcelData.PassPrice = landData.passPrice;
             updatePacket.ParcelData.PublicCount = 0; //unemplemented
-
+            
             uint regionFlags = (uint) m_scene.RegionInfo.EstateSettings.regionFlags;
             updatePacket.ParcelData.RegionDenyAnonymous = ((regionFlags & (uint) Simulator.RegionFlags.DenyAnonymous) >
                                                            0);
@@ -215,7 +215,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
             {
                 updatePacket.ParcelData.SimWideMaxPrims =
                     Convert.ToInt32(
-                        Math.Round((Convert.ToDecimal(landData.simwideArea)/Convert.ToDecimal(65536))*15000*
+                        Math.Round((Convert.ToDecimal(landData.simwideArea) / Convert.ToDecimal(65536)) * m_scene.objectCapacity *
                                    Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor)));
             }
             else
-- 
cgit v1.1