From 80d8e2889e62d8900837d37a800a4eeaae5ffc5a Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Wed, 23 Jul 2008 13:24:25 +0000 Subject: Update svn properties. Formatting cleanup. Remove a compiler warning. --- .../Modules/Scripting/EMailModules/EmailModule.cs | 266 ++++++++++----------- .../Modules/World/Archiver/AssetsArchiver.cs | 2 +- .../Modules/World/Estate/EstateManagementModule.cs | 80 +++---- .../Environment/Modules/World/Land/LandObject.cs | 6 +- 4 files changed, 177 insertions(+), 177 deletions(-) (limited to 'OpenSim/Region/Environment/Modules') diff --git a/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs index c65f958..1162c25 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs @@ -78,33 +78,33 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules //Load SMTP SERVER config try - { - if ((SMTPConfig = m_Config.Configs["SMTP"]) == null) - { - m_log.InfoFormat("[SMTP] SMTP server not configured"); - m_Enabled = false; - return; - } - - if (!SMTPConfig.GetBoolean("enabled", false)) - { - m_log.InfoFormat("[SMTP] module disabled in configuration"); - m_Enabled = false; - return; - } - - m_HostName = SMTPConfig.GetString("host_domain_header_from", m_HostName); - SMTP_SERVER_HOSTNAME = SMTPConfig.GetString("SMTP_SERVER_HOSTNAME",SMTP_SERVER_HOSTNAME); - SMTP_SERVER_PORT = SMTPConfig.GetInt("SMTP_SERVER_PORT", SMTP_SERVER_PORT); - SMTP_SERVER_LOGIN = SMTPConfig.GetString("SMTP_SERVER_LOGIN", SMTP_SERVER_LOGIN); - SMTP_SERVER_PASSWORD = SMTPConfig.GetString("SMTP_SERVER_PASSWORD", SMTP_SERVER_PASSWORD); - } - catch (Exception e) - { - m_log.Error("[EMAIL] DefaultEmailModule not configured: "+ e.Message); - m_Enabled = false; - return; - } + { + if ((SMTPConfig = m_Config.Configs["SMTP"]) == null) + { + m_log.InfoFormat("[SMTP] SMTP server not configured"); + m_Enabled = false; + return; + } + + if (!SMTPConfig.GetBoolean("enabled", false)) + { + m_log.InfoFormat("[SMTP] module disabled in configuration"); + m_Enabled = false; + return; + } + + m_HostName = SMTPConfig.GetString("host_domain_header_from", m_HostName); + SMTP_SERVER_HOSTNAME = SMTPConfig.GetString("SMTP_SERVER_HOSTNAME",SMTP_SERVER_HOSTNAME); + SMTP_SERVER_PORT = SMTPConfig.GetInt("SMTP_SERVER_PORT", SMTP_SERVER_PORT); + SMTP_SERVER_LOGIN = SMTPConfig.GetString("SMTP_SERVER_LOGIN", SMTP_SERVER_LOGIN); + SMTP_SERVER_PASSWORD = SMTPConfig.GetString("SMTP_SERVER_PASSWORD", SMTP_SERVER_PASSWORD); + } + catch (Exception e) + { + m_log.Error("[EMAIL] DefaultEmailModule not configured: "+ e.Message); + m_Enabled = false; + return; + } // It's a go! if (m_Enabled) @@ -124,7 +124,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules m_Scenes.Add(scene.RegionInfo.RegionHandle, scene); } } - + m_log.Info("[EMAIL] Activated DefaultEmailModule"); } } @@ -152,14 +152,14 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules /// /// private void DelayInSeconds(int seconds) - { - TimeSpan DiffDelay = new TimeSpan(0, 0, seconds); - DateTime EndDelay = DateTime.Now.Add(DiffDelay); - while (DateTime.Now < EndDelay) - { - ;//Do nothing!! - } - } + { + TimeSpan DiffDelay = new TimeSpan(0, 0, seconds); + DateTime EndDelay = DateTime.Now.Add(DiffDelay); + while (DateTime.Now < EndDelay) + { + ;//Do nothing!! + } + } private SceneObjectPart findPrim(LLUUID objectID, out string ObjectRegionName) { @@ -171,7 +171,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules if (part != null) { ObjectRegionName = s.RegionInfo.RegionName; - return part; + return part; } } } @@ -181,108 +181,108 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules private void resolveNamePositionRegionName(LLUUID objectID, out string ObjectName, out string ObjectAbsolutePosition, out string ObjectRegionName) { - string m_ObjectRegionName; - SceneObjectPart part = findPrim(objectID, out m_ObjectRegionName); + string m_ObjectRegionName; + SceneObjectPart part = findPrim(objectID, out m_ObjectRegionName); if (part != null) { - ObjectAbsolutePosition = part.AbsolutePosition.ToString(); - ObjectName = part.Name; - ObjectRegionName = m_ObjectRegionName; - return; + ObjectAbsolutePosition = part.AbsolutePosition.ToString(); + ObjectName = part.Name; + ObjectRegionName = m_ObjectRegionName; + return; } ObjectAbsolutePosition = part.AbsolutePosition.ToString(); ObjectName = part.Name; ObjectRegionName = m_ObjectRegionName; return; } - - /// - /// SendMail function utilized by llEMail - /// - /// - /// - /// - /// - public void SendEmail(LLUUID objectID, string address, string subject, string body) - { - //Check if address is empty - if (address == string.Empty) - return; - - //FIXED:Check the email is correct form in REGEX - string EMailpatternStrict = @"^(([^<>()[\]\\.,;:\s@\""]+" - + @"(\.[^<>()[\]\\.,;:\s@\""]+)*)|(\"".+\""))@" - + @"((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}" - + @"\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+" - + @"[a-zA-Z]{2,}))$"; - Regex EMailreStrict = new Regex(EMailpatternStrict); - bool isEMailStrictMatch = EMailreStrict.IsMatch(address); - if (!isEMailStrictMatch) - { - m_log.Error("[EMAIL] REGEX Problem in EMail Address: "+address); - return; - } - //FIXME:Check if subject + body = 4096 Byte - if ((subject.Length + body.Length) > 1024) - { - m_log.Error("[EMAIL] subject + body > 1024 Byte"); - return; - } - - try - { - string LastObjectName = string.Empty; - string LastObjectPosition = string.Empty; - string LastObjectRegionName = string.Empty; - //DONE: Message as Second Life style - //20 second delay - AntiSpam System - for now only 10 seconds - DelayInSeconds(10); - //Creation EmailMessage - EmailMessage emailMessage = new EmailMessage(); - //From - emailMessage.FromAddress = new EmailAddress(objectID.UUID.ToString()+"@"+m_HostName); - //To - Only One - emailMessage.AddToAddress(new EmailAddress(address)); - //Subject - emailMessage.Subject = subject; - //TEXT Body - resolveNamePositionRegionName(objectID, out LastObjectName, out LastObjectPosition, out LastObjectRegionName); - emailMessage.TextPart = new TextAttachment("Object-Name: " + LastObjectName + - "\r\nRegion: " + LastObjectRegionName + "\r\nLocal-Position: " + - LastObjectPosition+"\r\n\r\n\r\n" + body); - //HTML Body - emailMessage.HtmlPart = new HtmlAttachment("

" + - "
Object-Name: " + LastObjectName + - "
Region: " + LastObjectRegionName + - "
Local-Position: " + LastObjectPosition + "


" - +body+"\r\n

"); - - //Set SMTP SERVER config - SmtpServer smtpServer=new SmtpServer(SMTP_SERVER_HOSTNAME,SMTP_SERVER_PORT); - //Authentication - smtpServer.SmtpAuthToken=new SmtpAuthToken(SMTP_SERVER_LOGIN, SMTP_SERVER_PASSWORD); - //Send Email Message - emailMessage.Send(smtpServer); - //Log - m_log.Info("[EMAIL] EMail sent to: " + address + " from object: " + objectID.UUID.ToString()); - } - catch (Exception e) - { - m_log.Error("[EMAIL] DefaultEmailModule Exception: "+e.Message); - return; - } - } - - /// - /// - /// - /// - /// - /// - /// - public Email GetNextEmail(LLUUID objectID, string sender, string subject) - { - return null; - } - } + + /// + /// SendMail function utilized by llEMail + /// + /// + /// + /// + /// + public void SendEmail(LLUUID objectID, string address, string subject, string body) + { + //Check if address is empty + if (address == string.Empty) + return; + + //FIXED:Check the email is correct form in REGEX + string EMailpatternStrict = @"^(([^<>()[\]\\.,;:\s@\""]+" + + @"(\.[^<>()[\]\\.,;:\s@\""]+)*)|(\"".+\""))@" + + @"((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}" + + @"\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+" + + @"[a-zA-Z]{2,}))$"; + Regex EMailreStrict = new Regex(EMailpatternStrict); + bool isEMailStrictMatch = EMailreStrict.IsMatch(address); + if (!isEMailStrictMatch) + { + m_log.Error("[EMAIL] REGEX Problem in EMail Address: "+address); + return; + } + //FIXME:Check if subject + body = 4096 Byte + if ((subject.Length + body.Length) > 1024) + { + m_log.Error("[EMAIL] subject + body > 1024 Byte"); + return; + } + + try + { + string LastObjectName = string.Empty; + string LastObjectPosition = string.Empty; + string LastObjectRegionName = string.Empty; + //DONE: Message as Second Life style + //20 second delay - AntiSpam System - for now only 10 seconds + DelayInSeconds(10); + //Creation EmailMessage + EmailMessage emailMessage = new EmailMessage(); + //From + emailMessage.FromAddress = new EmailAddress(objectID.UUID.ToString()+"@"+m_HostName); + //To - Only One + emailMessage.AddToAddress(new EmailAddress(address)); + //Subject + emailMessage.Subject = subject; + //TEXT Body + resolveNamePositionRegionName(objectID, out LastObjectName, out LastObjectPosition, out LastObjectRegionName); + emailMessage.TextPart = new TextAttachment("Object-Name: " + LastObjectName + + "\r\nRegion: " + LastObjectRegionName + "\r\nLocal-Position: " + + LastObjectPosition+"\r\n\r\n\r\n" + body); + //HTML Body + emailMessage.HtmlPart = new HtmlAttachment("

" + + "
Object-Name: " + LastObjectName + + "
Region: " + LastObjectRegionName + + "
Local-Position: " + LastObjectPosition + "


" + +body+"\r\n

"); + + //Set SMTP SERVER config + SmtpServer smtpServer=new SmtpServer(SMTP_SERVER_HOSTNAME,SMTP_SERVER_PORT); + //Authentication + smtpServer.SmtpAuthToken=new SmtpAuthToken(SMTP_SERVER_LOGIN, SMTP_SERVER_PASSWORD); + //Send Email Message + emailMessage.Send(smtpServer); + //Log + m_log.Info("[EMAIL] EMail sent to: " + address + " from object: " + objectID.UUID.ToString()); + } + catch (Exception e) + { + m_log.Error("[EMAIL] DefaultEmailModule Exception: "+e.Message); + return; + } + } + + /// + /// + /// + /// + /// + /// + /// + public Email GetNextEmail(LLUUID objectID, string sender, string subject) + { + return null; + } + } } diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs index 81d85d2..2704224 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs @@ -40,7 +40,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver /// public class AssetsArchiver { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); /// /// Archive assets diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs index 3996fb3..c0fdc05 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs @@ -52,7 +52,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate //SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, LLUUID covenant) uint sun = 0; - if(!m_scene.RegionInfo.EstateSettings.UseGlobalTime) + if (!m_scene.RegionInfo.EstateSettings.UseGlobalTime) sun=(uint)(m_scene.RegionInfo.EstateSettings.SunPosition*1024.0) + 0x1800; remote_client.SendDetailedEstateData(invoice, m_scene.RegionInfo.EstateSettings.EstateName, @@ -98,7 +98,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate m_scene.RegionInfo.RegionSettings.ObjectBonus = objectBonusFactor; - if(matureLevel <= 13) + if (matureLevel <= 13) m_scene.RegionInfo.RegionSettings.Maturity = 0; else m_scene.RegionInfo.RegionSettings.Maturity = 1; @@ -245,7 +245,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate ScenePresence s = m_scene.GetScenePresence(user); if (s != null) { - if(!s.IsChildAgent) + if (!s.IsChildAgent) m_scene.TeleportClientHome(user, s.ControllingClient); } @@ -395,7 +395,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate args.redirectGridY = m_scene.RegionInfo.EstateSettings.RedirectGridY; args.regionFlags = GetRegionFlags(); byte mature = 13; - if(m_scene.RegionInfo.RegionSettings.Maturity == 1) + if (m_scene.RegionInfo.RegionSettings.Maturity == 1) mature = 21; args.simAccess = mature; @@ -550,7 +550,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate args.terrainStartHeight3 = (float)m_scene.RegionInfo.RegionSettings.Elevation1NE; args.terrainHeightRange3 = (float)m_scene.RegionInfo.RegionSettings.Elevation2NE; byte mature = 13; - if(m_scene.RegionInfo.RegionSettings.Maturity == 1) + if (m_scene.RegionInfo.RegionSettings.Maturity == 1) mature = 21; args.simAccess = mature; args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight; @@ -579,7 +579,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate public void handleEstateChangeInfo(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, UInt32 parms1, UInt32 parms2) { - if(parms2 == 0) + if (parms2 == 0) { m_scene.RegionInfo.EstateSettings.UseGlobalTime = true; m_scene.RegionInfo.EstateSettings.SunPosition = 0.0; @@ -590,37 +590,37 @@ namespace OpenSim.Region.Environment.Modules.World.Estate m_scene.RegionInfo.EstateSettings.SunPosition = (double)(parms2 - 0x1800)/1024.0; } - if((parms1 & 0x00000010) != 0) + if ((parms1 & 0x00000010) != 0) m_scene.RegionInfo.EstateSettings.FixedSun = true; else m_scene.RegionInfo.EstateSettings.FixedSun = false; - if((parms1 & 0x00008000) != 0) + if ((parms1 & 0x00008000) != 0) m_scene.RegionInfo.EstateSettings.PublicAccess = true; else m_scene.RegionInfo.EstateSettings.PublicAccess = false; - if((parms1 & 0x10000000) != 0) + if ((parms1 & 0x10000000) != 0) m_scene.RegionInfo.EstateSettings.AllowVoice = true; else m_scene.RegionInfo.EstateSettings.AllowVoice = false; - if((parms1 & 0x00100000) != 0) + if ((parms1 & 0x00100000) != 0) m_scene.RegionInfo.EstateSettings.AllowDirectTeleport = true; else m_scene.RegionInfo.EstateSettings.AllowDirectTeleport = false; - if((parms1 & 0x00800000) != 0) + if ((parms1 & 0x00800000) != 0) m_scene.RegionInfo.EstateSettings.DenyAnonymous = true; else m_scene.RegionInfo.EstateSettings.DenyAnonymous = false; - if((parms1 & 0x01000000) != 0) + if ((parms1 & 0x01000000) != 0) m_scene.RegionInfo.EstateSettings.DenyIdentified = true; else m_scene.RegionInfo.EstateSettings.DenyIdentified = false; - if((parms1 & 0x02000000) != 0) + if ((parms1 & 0x02000000) != 0) m_scene.RegionInfo.EstateSettings.DenyTransacted = true; else m_scene.RegionInfo.EstateSettings.DenyTransacted = false; @@ -628,10 +628,10 @@ namespace OpenSim.Region.Environment.Modules.World.Estate m_scene.RegionInfo.EstateSettings.Save(); float sun = (float)m_scene.RegionInfo.RegionSettings.SunPosition; - if(m_scene.RegionInfo.RegionSettings.UseEstateSun) + if (m_scene.RegionInfo.RegionSettings.UseEstateSun) { sun = (float)m_scene.RegionInfo.EstateSettings.SunPosition; - if(m_scene.RegionInfo.EstateSettings.UseGlobalTime) + if (m_scene.RegionInfo.EstateSettings.UseGlobalTime) sun = m_scene.EventManager.GetSunLindenHour(); } @@ -726,30 +726,30 @@ namespace OpenSim.Region.Environment.Modules.World.Estate // Fully implemented // - if(m_scene.RegionInfo.RegionSettings.AllowDamage) + if (m_scene.RegionInfo.RegionSettings.AllowDamage) flags |= Simulator.RegionFlags.AllowDamage; - if(m_scene.RegionInfo.RegionSettings.BlockTerraform) + if (m_scene.RegionInfo.RegionSettings.BlockTerraform) flags |= Simulator.RegionFlags.BlockTerraform; - if(!m_scene.RegionInfo.RegionSettings.AllowLandResell) + if (!m_scene.RegionInfo.RegionSettings.AllowLandResell) flags |= Simulator.RegionFlags.BlockLandResell; - if(m_scene.RegionInfo.RegionSettings.DisableCollisions) + if (m_scene.RegionInfo.RegionSettings.DisableCollisions) flags |= Simulator.RegionFlags.SkipCollisions; - if(m_scene.RegionInfo.RegionSettings.DisableScripts) + if (m_scene.RegionInfo.RegionSettings.DisableScripts) flags |= Simulator.RegionFlags.SkipScripts; - if(m_scene.RegionInfo.RegionSettings.DisablePhysics) + if (m_scene.RegionInfo.RegionSettings.DisablePhysics) flags |= Simulator.RegionFlags.SkipPhysics; - if(m_scene.RegionInfo.RegionSettings.BlockFly) + if (m_scene.RegionInfo.RegionSettings.BlockFly) flags |= Simulator.RegionFlags.NoFly; - if(m_scene.RegionInfo.RegionSettings.RestrictPushing) + if (m_scene.RegionInfo.RegionSettings.RestrictPushing) flags |= Simulator.RegionFlags.RestrictPushObject; - if(m_scene.RegionInfo.RegionSettings.AllowLandJoinDivide) + if (m_scene.RegionInfo.RegionSettings.AllowLandJoinDivide) flags |= Simulator.RegionFlags.AllowParcelChanges; - if(m_scene.RegionInfo.RegionSettings.BlockShowInSearch) + if (m_scene.RegionInfo.RegionSettings.BlockShowInSearch) flags |= (Simulator.RegionFlags)(1 << 29); - if(m_scene.RegionInfo.RegionSettings.FixedSun) + if (m_scene.RegionInfo.RegionSettings.FixedSun) flags |= Simulator.RegionFlags.SunFixed; - if(m_scene.RegionInfo.RegionSettings.Sandbox) + if (m_scene.RegionInfo.RegionSettings.Sandbox) flags |= Simulator.RegionFlags.Sandbox; // Handled in LandObject.cs: AllowLandmark @@ -769,30 +769,30 @@ namespace OpenSim.Region.Environment.Modules.World.Estate { Simulator.RegionFlags flags = Simulator.RegionFlags.None; - if(m_scene.RegionInfo.EstateSettings.FixedSun) + if (m_scene.RegionInfo.EstateSettings.FixedSun) flags |= Simulator.RegionFlags.SunFixed; - if(m_scene.RegionInfo.EstateSettings.PublicAccess) + if (m_scene.RegionInfo.EstateSettings.PublicAccess) flags |= (Simulator.RegionFlags.PublicAllowed | Simulator.RegionFlags.ExternallyVisible); - if(m_scene.RegionInfo.EstateSettings.AllowVoice) + if (m_scene.RegionInfo.EstateSettings.AllowVoice) flags |= Simulator.RegionFlags.AllowVoice; - if(m_scene.RegionInfo.EstateSettings.AllowDirectTeleport) + if (m_scene.RegionInfo.EstateSettings.AllowDirectTeleport) flags |= Simulator.RegionFlags.AllowDirectTeleport; - if(m_scene.RegionInfo.EstateSettings.DenyAnonymous) + if (m_scene.RegionInfo.EstateSettings.DenyAnonymous) flags |= Simulator.RegionFlags.DenyAnonymous; - if(m_scene.RegionInfo.EstateSettings.DenyIdentified) + if (m_scene.RegionInfo.EstateSettings.DenyIdentified) flags |= Simulator.RegionFlags.DenyIdentified; - if(m_scene.RegionInfo.EstateSettings.DenyTransacted) + if (m_scene.RegionInfo.EstateSettings.DenyTransacted) flags |= Simulator.RegionFlags.DenyTransacted; - if(m_scene.RegionInfo.EstateSettings.AbuseEmailToEstateOwner) + if (m_scene.RegionInfo.EstateSettings.AbuseEmailToEstateOwner) flags |= Simulator.RegionFlags.AbuseEmailToEstateOwner; - if(m_scene.RegionInfo.EstateSettings.BlockDwell) + if (m_scene.RegionInfo.EstateSettings.BlockDwell) flags |= Simulator.RegionFlags.BlockDwell; - if(m_scene.RegionInfo.EstateSettings.EstateSkipScripts) + if (m_scene.RegionInfo.EstateSettings.EstateSkipScripts) flags |= Simulator.RegionFlags.EstateSkipScripts; - if(m_scene.RegionInfo.EstateSettings.ResetHomeOnTeleport) + if (m_scene.RegionInfo.EstateSettings.ResetHomeOnTeleport) flags |= Simulator.RegionFlags.ResetHomeOnTeleport; - if(m_scene.RegionInfo.EstateSettings.TaxFree) + if (m_scene.RegionInfo.EstateSettings.TaxFree) flags |= Simulator.RegionFlags.TaxFree; return (uint)flags; @@ -804,7 +804,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate return true; List ems = new List(m_scene.RegionInfo.EstateSettings.EstateManagers); - if(ems.Contains(avatarID)) + if (ems.Contains(avatarID)) return true; return false; diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs index 5aed2a7..02d74e5 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs @@ -163,11 +163,11 @@ namespace OpenSim.Region.Environment.Modules.World.Land { IEstateModule estateModule = m_scene.RequestModuleInterface(); uint regionFlags = 336723974 & ~((uint)(Simulator.RegionFlags.AllowLandmark | Simulator.RegionFlags.AllowSetHome)); - if(estateModule != null) + if (estateModule != null) regionFlags = estateModule.GetRegionFlags(); - if((landData.landFlags & (uint)Parcel.ParcelFlags.AllowLandmark) != 0) + if ((landData.landFlags & (uint)Parcel.ParcelFlags.AllowLandmark) != 0) regionFlags |= (uint)Simulator.RegionFlags.AllowLandmark; - if(landData.ownerID == remote_client.AgentId) + if (landData.ownerID == remote_client.AgentId) regionFlags |= (uint)Simulator.RegionFlags.AllowSetHome; remote_client.SendLandProperties(remote_client, sequence_id, snap_selection, request_result, landData, -- cgit v1.1