aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorTeravus Ovares2008-04-15 06:21:44 +0000
committerTeravus Ovares2008-04-15 06:21:44 +0000
commit682f4e9257bcec6e9690145760558cc3331bc5d8 (patch)
treecc3a7212426a9b5877ead378ad35a339663a838e /OpenSim/Region/Environment
parent* Committing shell of a whole-region serialiser. This is not complete and wil... (diff)
downloadopensim-SC-682f4e9257bcec6e9690145760558cc3331bc5d8.zip
opensim-SC-682f4e9257bcec6e9690145760558cc3331bc5d8.tar.gz
opensim-SC-682f4e9257bcec6e9690145760558cc3331bc5d8.tar.bz2
opensim-SC-682f4e9257bcec6e9690145760558cc3331bc5d8.tar.xz
* 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.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/EstateManager.cs32
-rw-r--r--OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs44
-rw-r--r--OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs6
3 files changed, 64 insertions, 18 deletions
diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
index 63f2a53..ec556a6 100644
--- a/OpenSim/Region/Environment/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -289,7 +289,7 @@ namespace OpenSim.Region.Environment
289 } 289 }
290 290
291 //Sending Estate Settings 291 //Sending Estate Settings
292 returnblock[0].Parameter = Helpers.StringToField(m_scene.RegionInfo.MasterAvatarFirstName + m_scene.RegionInfo.MasterAvatarLastName); 292 returnblock[0].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateName);
293 returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.MasterAvatarAssignedUUID.ToString()); 293 returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.MasterAvatarAssignedUUID.ToString());
294 returnblock[2].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateID.ToString()); 294 returnblock[2].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateID.ToString());
295 295
@@ -578,21 +578,22 @@ namespace OpenSim.Region.Environment
578 { 578 {
579 RegionInfoPacket rinfopack = new RegionInfoPacket(); 579 RegionInfoPacket rinfopack = new RegionInfoPacket();
580 RegionInfoPacket.RegionInfoBlock rinfoblk = new RegionInfoPacket.RegionInfoBlock(); 580 RegionInfoPacket.RegionInfoBlock rinfoblk = new RegionInfoPacket.RegionInfoBlock();
581 581 rinfopack.AgentData.AgentID = client.AgentId;
582 rinfoblk.BillableFactor = 0; 582 rinfopack.AgentData.SessionID = client.SessionId;
583 rinfoblk.EstateID = 02; 583 rinfoblk.BillableFactor = m_regInfo.EstateSettings.billableFactor;
584 rinfoblk.MaxAgents = 100; 584 rinfoblk.EstateID = m_regInfo.EstateSettings.estateID;
585 rinfoblk.ObjectBonusFactor = 1.0f; 585 rinfoblk.MaxAgents = m_regInfo.EstateSettings.maxAgents;
586 rinfoblk.ParentEstateID = 0; 586 rinfoblk.ObjectBonusFactor = m_regInfo.EstateSettings.objectBonusFactor;
587 rinfoblk.PricePerMeter = 0; 587 rinfoblk.ParentEstateID = m_regInfo.EstateSettings.parentEstateID;
588 rinfoblk.RedirectGridX = 0; 588 rinfoblk.PricePerMeter = m_regInfo.EstateSettings.pricePerMeter;
589 rinfoblk.RedirectGridY = 0; 589 rinfoblk.RedirectGridX = m_regInfo.EstateSettings.redirectGridX;
590 rinfoblk.RegionFlags = (uint) m_regInfo.EstateSettings.regionFlags; 590 rinfoblk.RedirectGridY = m_regInfo.EstateSettings.redirectGridY;
591 rinfoblk.RegionFlags = (uint)( m_regInfo.EstateSettings.regionFlags);
591 rinfoblk.SimAccess = (byte) m_regInfo.EstateSettings.simAccess; 592 rinfoblk.SimAccess = (byte) m_regInfo.EstateSettings.simAccess;
592 rinfoblk.SunHour = m_regInfo.EstateSettings.sunHour; 593 rinfoblk.SunHour = m_regInfo.EstateSettings.sunHour;
593 rinfoblk.TerrainLowerLimit = 20; 594 rinfoblk.TerrainLowerLimit = m_regInfo.EstateSettings.terrainLowerLimit;
594 rinfoblk.TerrainRaiseLimit = 20; 595 rinfoblk.TerrainRaiseLimit = m_regInfo.EstateSettings.terrainRaiseLimit;
595 rinfoblk.UseEstateSun = true; 596 rinfoblk.UseEstateSun = !m_regInfo.EstateSettings.useFixedSun;
596 rinfoblk.WaterHeight = m_regInfo.EstateSettings.waterHeight; 597 rinfoblk.WaterHeight = m_regInfo.EstateSettings.waterHeight;
597 rinfoblk.SimName = Helpers.StringToField(m_regInfo.RegionName); 598 rinfoblk.SimName = Helpers.StringToField(m_regInfo.RegionName);
598 599
@@ -650,7 +651,7 @@ namespace OpenSim.Region.Environment
650 regionInfoPacket.RegionInfo.PricePerMeter = m_regInfo.EstateSettings.pricePerMeter; 651 regionInfoPacket.RegionInfo.PricePerMeter = m_regInfo.EstateSettings.pricePerMeter;
651 regionInfoPacket.RegionInfo.RedirectGridX = m_regInfo.EstateSettings.redirectGridX; 652 regionInfoPacket.RegionInfo.RedirectGridX = m_regInfo.EstateSettings.redirectGridX;
652 regionInfoPacket.RegionInfo.RedirectGridY = m_regInfo.EstateSettings.redirectGridY; 653 regionInfoPacket.RegionInfo.RedirectGridY = m_regInfo.EstateSettings.redirectGridY;
653 regionInfoPacket.RegionInfo.RegionFlags = (uint) m_regInfo.EstateSettings.regionFlags; 654 regionInfoPacket.RegionInfo.RegionFlags = (uint)(m_regInfo.EstateSettings.regionFlags);
654 regionInfoPacket.RegionInfo.SimAccess = (byte) m_regInfo.EstateSettings.simAccess; 655 regionInfoPacket.RegionInfo.SimAccess = (byte) m_regInfo.EstateSettings.simAccess;
655 regionInfoPacket.RegionInfo.SimName = Helpers.StringToField(m_regInfo.RegionName); 656 regionInfoPacket.RegionInfo.SimName = Helpers.StringToField(m_regInfo.RegionName);
656 regionInfoPacket.RegionInfo.SunHour = m_regInfo.EstateSettings.sunHour; 657 regionInfoPacket.RegionInfo.SunHour = m_regInfo.EstateSettings.sunHour;
@@ -658,6 +659,7 @@ namespace OpenSim.Region.Environment
658 regionInfoPacket.RegionInfo.TerrainRaiseLimit = m_regInfo.EstateSettings.terrainRaiseLimit; 659 regionInfoPacket.RegionInfo.TerrainRaiseLimit = m_regInfo.EstateSettings.terrainRaiseLimit;
659 regionInfoPacket.RegionInfo.UseEstateSun = !m_regInfo.EstateSettings.useFixedSun; 660 regionInfoPacket.RegionInfo.UseEstateSun = !m_regInfo.EstateSettings.useFixedSun;
660 regionInfoPacket.RegionInfo.WaterHeight = m_regInfo.EstateSettings.waterHeight; 661 regionInfoPacket.RegionInfo.WaterHeight = m_regInfo.EstateSettings.waterHeight;
662
661 663
662 remote_client.OutPacket(regionInfoPacket, ThrottleOutPacketType.Task); 664 remote_client.OutPacket(regionInfoPacket, ThrottleOutPacketType.Task);
663 } 665 }
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
144 // Centralized grid structure using OpenSimWi Redux revision 9+ 144 // Centralized grid structure using OpenSimWi Redux revision 9+
145 // https://opensimwiredux.svn.sourceforge.net/svnroot/opensimwiredux 145 // https://opensimwiredux.svn.sourceforge.net/svnroot/opensimwiredux
146 scene.AddXmlRPCHandler("dynamic_balance_update_request", GridMoneyUpdate); 146 scene.AddXmlRPCHandler("dynamic_balance_update_request", GridMoneyUpdate);
147 scene.AddXmlRPCHandler("user_alert", UserAlert);
147 } 148 }
148 else 149 else
149 { 150 {
@@ -1164,6 +1165,49 @@ namespace OpenSim.Region.Environment.Modules
1164 r.Value = rparms; 1165 r.Value = rparms;
1165 return r; 1166 return r;
1166 } 1167 }
1168 /// <summary>
1169 /// XMLRPC handler to send alert message and sound to client
1170 /// </summary>
1171 public XmlRpcResponse UserAlert(XmlRpcRequest request)
1172 {
1173 XmlRpcResponse ret = new XmlRpcResponse();
1174 Hashtable retparam = new Hashtable();
1175 Hashtable requestData = (Hashtable)request.Params[0];
1176
1177 LLUUID agentId = LLUUID.Zero;
1178 LLUUID soundId = LLUUID.Zero;
1179
1180 Helpers.TryParse((string)requestData["agentId"], out agentId);
1181 Helpers.TryParse((string)requestData["soundId"], out soundId);
1182 string text=(string)requestData["text"];
1183 string secret=(string)requestData["secret"];
1184
1185 Scene userScene = GetRandomScene();
1186 if(userScene.RegionInfo.regionSecret.ToString() == secret)
1187 {
1188 IClientAPI client = LocateClientObject(agentId);
1189
1190 if (client != null)
1191 {
1192 if(soundId != LLUUID.Zero)
1193 client.SendPlayAttachedSound(soundId, LLUUID.Zero, LLUUID.Zero, 1.0f, 0);
1194 client.SendBlueBoxMessage(LLUUID.Zero, LLUUID.Zero, "", text);
1195 retparam.Add("success", true);
1196 }
1197 else
1198 {
1199 retparam.Add("success", false);
1200 }
1201 }
1202 else
1203 {
1204 retparam.Add("success", false);
1205 }
1206 ret.Value = retparam;
1207
1208 return ret;
1209 }
1210
1167 1211
1168# region Standalone box enablers only 1212# region Standalone box enablers only
1169 1213
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
172 { 172 {
173 updatePacket.ParcelData.MaxPrims = 173 updatePacket.ParcelData.MaxPrims =
174 Convert.ToInt32( 174 Convert.ToInt32(
175 Math.Round((Convert.ToDecimal(landData.area)/Convert.ToDecimal(65536))*15000* 175 Math.Round((Convert.ToDecimal(landData.area)/Convert.ToDecimal(65536))*m_scene.objectCapacity*
176 Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor))); 176 Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor)));
177 } 177 }
178 else 178 else
@@ -194,7 +194,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
194 updatePacket.ParcelData.PassHours = landData.passHours; 194 updatePacket.ParcelData.PassHours = landData.passHours;
195 updatePacket.ParcelData.PassPrice = landData.passPrice; 195 updatePacket.ParcelData.PassPrice = landData.passPrice;
196 updatePacket.ParcelData.PublicCount = 0; //unemplemented 196 updatePacket.ParcelData.PublicCount = 0; //unemplemented
197 197
198 uint regionFlags = (uint) m_scene.RegionInfo.EstateSettings.regionFlags; 198 uint regionFlags = (uint) m_scene.RegionInfo.EstateSettings.regionFlags;
199 updatePacket.ParcelData.RegionDenyAnonymous = ((regionFlags & (uint) Simulator.RegionFlags.DenyAnonymous) > 199 updatePacket.ParcelData.RegionDenyAnonymous = ((regionFlags & (uint) Simulator.RegionFlags.DenyAnonymous) >
200 0); 200 0);
@@ -215,7 +215,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
215 { 215 {
216 updatePacket.ParcelData.SimWideMaxPrims = 216 updatePacket.ParcelData.SimWideMaxPrims =
217 Convert.ToInt32( 217 Convert.ToInt32(
218 Math.Round((Convert.ToDecimal(landData.simwideArea)/Convert.ToDecimal(65536))*15000* 218 Math.Round((Convert.ToDecimal(landData.simwideArea) / Convert.ToDecimal(65536)) * m_scene.objectCapacity *
219 Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor))); 219 Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor)));
220 } 220 }
221 else 221 else