aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs266
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs80
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandObject.cs6
4 files changed, 177 insertions, 177 deletions
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
78 78
79 //Load SMTP SERVER config 79 //Load SMTP SERVER config
80 try 80 try
81 { 81 {
82 if ((SMTPConfig = m_Config.Configs["SMTP"]) == null) 82 if ((SMTPConfig = m_Config.Configs["SMTP"]) == null)
83 { 83 {
84 m_log.InfoFormat("[SMTP] SMTP server not configured"); 84 m_log.InfoFormat("[SMTP] SMTP server not configured");
85 m_Enabled = false; 85 m_Enabled = false;
86 return; 86 return;
87 } 87 }
88 88
89 if (!SMTPConfig.GetBoolean("enabled", false)) 89 if (!SMTPConfig.GetBoolean("enabled", false))
90 { 90 {
91 m_log.InfoFormat("[SMTP] module disabled in configuration"); 91 m_log.InfoFormat("[SMTP] module disabled in configuration");
92 m_Enabled = false; 92 m_Enabled = false;
93 return; 93 return;
94 } 94 }
95 95
96 m_HostName = SMTPConfig.GetString("host_domain_header_from", m_HostName); 96 m_HostName = SMTPConfig.GetString("host_domain_header_from", m_HostName);
97 SMTP_SERVER_HOSTNAME = SMTPConfig.GetString("SMTP_SERVER_HOSTNAME",SMTP_SERVER_HOSTNAME); 97 SMTP_SERVER_HOSTNAME = SMTPConfig.GetString("SMTP_SERVER_HOSTNAME",SMTP_SERVER_HOSTNAME);
98 SMTP_SERVER_PORT = SMTPConfig.GetInt("SMTP_SERVER_PORT", SMTP_SERVER_PORT); 98 SMTP_SERVER_PORT = SMTPConfig.GetInt("SMTP_SERVER_PORT", SMTP_SERVER_PORT);
99 SMTP_SERVER_LOGIN = SMTPConfig.GetString("SMTP_SERVER_LOGIN", SMTP_SERVER_LOGIN); 99 SMTP_SERVER_LOGIN = SMTPConfig.GetString("SMTP_SERVER_LOGIN", SMTP_SERVER_LOGIN);
100 SMTP_SERVER_PASSWORD = SMTPConfig.GetString("SMTP_SERVER_PASSWORD", SMTP_SERVER_PASSWORD); 100 SMTP_SERVER_PASSWORD = SMTPConfig.GetString("SMTP_SERVER_PASSWORD", SMTP_SERVER_PASSWORD);
101 } 101 }
102 catch (Exception e) 102 catch (Exception e)
103 { 103 {
104 m_log.Error("[EMAIL] DefaultEmailModule not configured: "+ e.Message); 104 m_log.Error("[EMAIL] DefaultEmailModule not configured: "+ e.Message);
105 m_Enabled = false; 105 m_Enabled = false;
106 return; 106 return;
107 } 107 }
108 108
109 // It's a go! 109 // It's a go!
110 if (m_Enabled) 110 if (m_Enabled)
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules
124 m_Scenes.Add(scene.RegionInfo.RegionHandle, scene); 124 m_Scenes.Add(scene.RegionInfo.RegionHandle, scene);
125 } 125 }
126 } 126 }
127 127
128 m_log.Info("[EMAIL] Activated DefaultEmailModule"); 128 m_log.Info("[EMAIL] Activated DefaultEmailModule");
129 } 129 }
130 } 130 }
@@ -152,14 +152,14 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules
152 /// </summary> 152 /// </summary>
153 /// <param name="seconds"></param> 153 /// <param name="seconds"></param>
154 private void DelayInSeconds(int seconds) 154 private void DelayInSeconds(int seconds)
155 { 155 {
156 TimeSpan DiffDelay = new TimeSpan(0, 0, seconds); 156 TimeSpan DiffDelay = new TimeSpan(0, 0, seconds);
157 DateTime EndDelay = DateTime.Now.Add(DiffDelay); 157 DateTime EndDelay = DateTime.Now.Add(DiffDelay);
158 while (DateTime.Now < EndDelay) 158 while (DateTime.Now < EndDelay)
159 { 159 {
160 ;//Do nothing!! 160 ;//Do nothing!!
161 } 161 }
162 } 162 }
163 163
164 private SceneObjectPart findPrim(LLUUID objectID, out string ObjectRegionName) 164 private SceneObjectPart findPrim(LLUUID objectID, out string ObjectRegionName)
165 { 165 {
@@ -171,7 +171,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules
171 if (part != null) 171 if (part != null)
172 { 172 {
173 ObjectRegionName = s.RegionInfo.RegionName; 173 ObjectRegionName = s.RegionInfo.RegionName;
174 return part; 174 return part;
175 } 175 }
176 } 176 }
177 } 177 }
@@ -181,108 +181,108 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules
181 181
182 private void resolveNamePositionRegionName(LLUUID objectID, out string ObjectName, out string ObjectAbsolutePosition, out string ObjectRegionName) 182 private void resolveNamePositionRegionName(LLUUID objectID, out string ObjectName, out string ObjectAbsolutePosition, out string ObjectRegionName)
183 { 183 {
184 string m_ObjectRegionName; 184 string m_ObjectRegionName;
185 SceneObjectPart part = findPrim(objectID, out m_ObjectRegionName); 185 SceneObjectPart part = findPrim(objectID, out m_ObjectRegionName);
186 if (part != null) 186 if (part != null)
187 { 187 {
188 ObjectAbsolutePosition = part.AbsolutePosition.ToString(); 188 ObjectAbsolutePosition = part.AbsolutePosition.ToString();
189 ObjectName = part.Name; 189 ObjectName = part.Name;
190 ObjectRegionName = m_ObjectRegionName; 190 ObjectRegionName = m_ObjectRegionName;
191 return; 191 return;
192 } 192 }
193 ObjectAbsolutePosition = part.AbsolutePosition.ToString(); 193 ObjectAbsolutePosition = part.AbsolutePosition.ToString();
194 ObjectName = part.Name; 194 ObjectName = part.Name;
195 ObjectRegionName = m_ObjectRegionName; 195 ObjectRegionName = m_ObjectRegionName;
196 return; 196 return;
197 } 197 }
198 198
199 /// <summary> 199 /// <summary>
200 /// SendMail function utilized by llEMail 200 /// SendMail function utilized by llEMail
201 /// </summary> 201 /// </summary>
202 /// <param name="objectID"></param> 202 /// <param name="objectID"></param>
203 /// <param name="address"></param> 203 /// <param name="address"></param>
204 /// <param name="subject"></param> 204 /// <param name="subject"></param>
205 /// <param name="body"></param> 205 /// <param name="body"></param>
206 public void SendEmail(LLUUID objectID, string address, string subject, string body) 206 public void SendEmail(LLUUID objectID, string address, string subject, string body)
207 { 207 {
208 //Check if address is empty 208 //Check if address is empty
209 if (address == string.Empty) 209 if (address == string.Empty)
210 return; 210 return;
211 211
212 //FIXED:Check the email is correct form in REGEX 212 //FIXED:Check the email is correct form in REGEX
213 string EMailpatternStrict = @"^(([^<>()[\]\\.,;:\s@\""]+" 213 string EMailpatternStrict = @"^(([^<>()[\]\\.,;:\s@\""]+"
214 + @"(\.[^<>()[\]\\.,;:\s@\""]+)*)|(\"".+\""))@" 214 + @"(\.[^<>()[\]\\.,;:\s@\""]+)*)|(\"".+\""))@"
215 + @"((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}" 215 + @"((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}"
216 + @"\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+" 216 + @"\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+"
217 + @"[a-zA-Z]{2,}))$"; 217 + @"[a-zA-Z]{2,}))$";
218 Regex EMailreStrict = new Regex(EMailpatternStrict); 218 Regex EMailreStrict = new Regex(EMailpatternStrict);
219 bool isEMailStrictMatch = EMailreStrict.IsMatch(address); 219 bool isEMailStrictMatch = EMailreStrict.IsMatch(address);
220 if (!isEMailStrictMatch) 220 if (!isEMailStrictMatch)
221 { 221 {
222 m_log.Error("[EMAIL] REGEX Problem in EMail Address: "+address); 222 m_log.Error("[EMAIL] REGEX Problem in EMail Address: "+address);
223 return; 223 return;
224 } 224 }
225 //FIXME:Check if subject + body = 4096 Byte 225 //FIXME:Check if subject + body = 4096 Byte
226 if ((subject.Length + body.Length) > 1024) 226 if ((subject.Length + body.Length) > 1024)
227 { 227 {
228 m_log.Error("[EMAIL] subject + body > 1024 Byte"); 228 m_log.Error("[EMAIL] subject + body > 1024 Byte");
229 return; 229 return;
230 } 230 }
231 231
232 try 232 try
233 { 233 {
234 string LastObjectName = string.Empty; 234 string LastObjectName = string.Empty;
235 string LastObjectPosition = string.Empty; 235 string LastObjectPosition = string.Empty;
236 string LastObjectRegionName = string.Empty; 236 string LastObjectRegionName = string.Empty;
237 //DONE: Message as Second Life style 237 //DONE: Message as Second Life style
238 //20 second delay - AntiSpam System - for now only 10 seconds 238 //20 second delay - AntiSpam System - for now only 10 seconds
239 DelayInSeconds(10); 239 DelayInSeconds(10);
240 //Creation EmailMessage 240 //Creation EmailMessage
241 EmailMessage emailMessage = new EmailMessage(); 241 EmailMessage emailMessage = new EmailMessage();
242 //From 242 //From
243 emailMessage.FromAddress = new EmailAddress(objectID.UUID.ToString()+"@"+m_HostName); 243 emailMessage.FromAddress = new EmailAddress(objectID.UUID.ToString()+"@"+m_HostName);
244 //To - Only One 244 //To - Only One
245 emailMessage.AddToAddress(new EmailAddress(address)); 245 emailMessage.AddToAddress(new EmailAddress(address));
246 //Subject 246 //Subject
247 emailMessage.Subject = subject; 247 emailMessage.Subject = subject;
248 //TEXT Body 248 //TEXT Body
249 resolveNamePositionRegionName(objectID, out LastObjectName, out LastObjectPosition, out LastObjectRegionName); 249 resolveNamePositionRegionName(objectID, out LastObjectName, out LastObjectPosition, out LastObjectRegionName);
250 emailMessage.TextPart = new TextAttachment("Object-Name: " + LastObjectName + 250 emailMessage.TextPart = new TextAttachment("Object-Name: " + LastObjectName +
251 "\r\nRegion: " + LastObjectRegionName + "\r\nLocal-Position: " + 251 "\r\nRegion: " + LastObjectRegionName + "\r\nLocal-Position: " +
252 LastObjectPosition+"\r\n\r\n\r\n" + body); 252 LastObjectPosition+"\r\n\r\n\r\n" + body);
253 //HTML Body 253 //HTML Body
254 emailMessage.HtmlPart = new HtmlAttachment("<html><body><p>" + 254 emailMessage.HtmlPart = new HtmlAttachment("<html><body><p>" +
255 "<BR>Object-Name: " + LastObjectName + 255 "<BR>Object-Name: " + LastObjectName +
256 "<BR>Region: " + LastObjectRegionName + 256 "<BR>Region: " + LastObjectRegionName +
257 "<BR>Local-Position: " + LastObjectPosition + "<BR><BR><BR>" 257 "<BR>Local-Position: " + LastObjectPosition + "<BR><BR><BR>"
258 +body+"\r\n</p></body><html>"); 258 +body+"\r\n</p></body><html>");
259 259
260 //Set SMTP SERVER config 260 //Set SMTP SERVER config
261 SmtpServer smtpServer=new SmtpServer(SMTP_SERVER_HOSTNAME,SMTP_SERVER_PORT); 261 SmtpServer smtpServer=new SmtpServer(SMTP_SERVER_HOSTNAME,SMTP_SERVER_PORT);
262 //Authentication 262 //Authentication
263 smtpServer.SmtpAuthToken=new SmtpAuthToken(SMTP_SERVER_LOGIN, SMTP_SERVER_PASSWORD); 263 smtpServer.SmtpAuthToken=new SmtpAuthToken(SMTP_SERVER_LOGIN, SMTP_SERVER_PASSWORD);
264 //Send Email Message 264 //Send Email Message
265 emailMessage.Send(smtpServer); 265 emailMessage.Send(smtpServer);
266 //Log 266 //Log
267 m_log.Info("[EMAIL] EMail sent to: " + address + " from object: " + objectID.UUID.ToString()); 267 m_log.Info("[EMAIL] EMail sent to: " + address + " from object: " + objectID.UUID.ToString());
268 } 268 }
269 catch (Exception e) 269 catch (Exception e)
270 { 270 {
271 m_log.Error("[EMAIL] DefaultEmailModule Exception: "+e.Message); 271 m_log.Error("[EMAIL] DefaultEmailModule Exception: "+e.Message);
272 return; 272 return;
273 } 273 }
274 } 274 }
275 275
276 /// <summary> 276 /// <summary>
277 /// 277 ///
278 /// </summary> 278 /// </summary>
279 /// <param name="objectID"></param> 279 /// <param name="objectID"></param>
280 /// <param name="sender"></param> 280 /// <param name="sender"></param>
281 /// <param name="subject"></param> 281 /// <param name="subject"></param>
282 /// <returns></returns> 282 /// <returns></returns>
283 public Email GetNextEmail(LLUUID objectID, string sender, string subject) 283 public Email GetNextEmail(LLUUID objectID, string sender, string subject)
284 { 284 {
285 return null; 285 return null;
286 } 286 }
287 } 287 }
288} 288}
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
40 /// </summary> 40 /// </summary>
41 public class AssetsArchiver 41 public class AssetsArchiver
42 { 42 {
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 43 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 44
45 /// <summary> 45 /// <summary>
46 /// Archive assets 46 /// 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
52 //SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, LLUUID covenant) 52 //SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, LLUUID covenant)
53 53
54 uint sun = 0; 54 uint sun = 0;
55 if(!m_scene.RegionInfo.EstateSettings.UseGlobalTime) 55 if (!m_scene.RegionInfo.EstateSettings.UseGlobalTime)
56 sun=(uint)(m_scene.RegionInfo.EstateSettings.SunPosition*1024.0) + 0x1800; 56 sun=(uint)(m_scene.RegionInfo.EstateSettings.SunPosition*1024.0) + 0x1800;
57 remote_client.SendDetailedEstateData(invoice, 57 remote_client.SendDetailedEstateData(invoice,
58 m_scene.RegionInfo.EstateSettings.EstateName, 58 m_scene.RegionInfo.EstateSettings.EstateName,
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
98 98
99 m_scene.RegionInfo.RegionSettings.ObjectBonus = objectBonusFactor; 99 m_scene.RegionInfo.RegionSettings.ObjectBonus = objectBonusFactor;
100 100
101 if(matureLevel <= 13) 101 if (matureLevel <= 13)
102 m_scene.RegionInfo.RegionSettings.Maturity = 0; 102 m_scene.RegionInfo.RegionSettings.Maturity = 0;
103 else 103 else
104 m_scene.RegionInfo.RegionSettings.Maturity = 1; 104 m_scene.RegionInfo.RegionSettings.Maturity = 1;
@@ -245,7 +245,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
245 ScenePresence s = m_scene.GetScenePresence(user); 245 ScenePresence s = m_scene.GetScenePresence(user);
246 if (s != null) 246 if (s != null)
247 { 247 {
248 if(!s.IsChildAgent) 248 if (!s.IsChildAgent)
249 m_scene.TeleportClientHome(user, s.ControllingClient); 249 m_scene.TeleportClientHome(user, s.ControllingClient);
250 } 250 }
251 251
@@ -395,7 +395,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
395 args.redirectGridY = m_scene.RegionInfo.EstateSettings.RedirectGridY; 395 args.redirectGridY = m_scene.RegionInfo.EstateSettings.RedirectGridY;
396 args.regionFlags = GetRegionFlags(); 396 args.regionFlags = GetRegionFlags();
397 byte mature = 13; 397 byte mature = 13;
398 if(m_scene.RegionInfo.RegionSettings.Maturity == 1) 398 if (m_scene.RegionInfo.RegionSettings.Maturity == 1)
399 mature = 21; 399 mature = 21;
400 args.simAccess = mature; 400 args.simAccess = mature;
401 401
@@ -550,7 +550,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
550 args.terrainStartHeight3 = (float)m_scene.RegionInfo.RegionSettings.Elevation1NE; 550 args.terrainStartHeight3 = (float)m_scene.RegionInfo.RegionSettings.Elevation1NE;
551 args.terrainHeightRange3 = (float)m_scene.RegionInfo.RegionSettings.Elevation2NE; 551 args.terrainHeightRange3 = (float)m_scene.RegionInfo.RegionSettings.Elevation2NE;
552 byte mature = 13; 552 byte mature = 13;
553 if(m_scene.RegionInfo.RegionSettings.Maturity == 1) 553 if (m_scene.RegionInfo.RegionSettings.Maturity == 1)
554 mature = 21; 554 mature = 21;
555 args.simAccess = mature; 555 args.simAccess = mature;
556 args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight; 556 args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight;
@@ -579,7 +579,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
579 579
580 public void handleEstateChangeInfo(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, UInt32 parms1, UInt32 parms2) 580 public void handleEstateChangeInfo(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, UInt32 parms1, UInt32 parms2)
581 { 581 {
582 if(parms2 == 0) 582 if (parms2 == 0)
583 { 583 {
584 m_scene.RegionInfo.EstateSettings.UseGlobalTime = true; 584 m_scene.RegionInfo.EstateSettings.UseGlobalTime = true;
585 m_scene.RegionInfo.EstateSettings.SunPosition = 0.0; 585 m_scene.RegionInfo.EstateSettings.SunPosition = 0.0;
@@ -590,37 +590,37 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
590 m_scene.RegionInfo.EstateSettings.SunPosition = (double)(parms2 - 0x1800)/1024.0; 590 m_scene.RegionInfo.EstateSettings.SunPosition = (double)(parms2 - 0x1800)/1024.0;
591 } 591 }
592 592
593 if((parms1 & 0x00000010) != 0) 593 if ((parms1 & 0x00000010) != 0)
594 m_scene.RegionInfo.EstateSettings.FixedSun = true; 594 m_scene.RegionInfo.EstateSettings.FixedSun = true;
595 else 595 else
596 m_scene.RegionInfo.EstateSettings.FixedSun = false; 596 m_scene.RegionInfo.EstateSettings.FixedSun = false;
597 597
598 if((parms1 & 0x00008000) != 0) 598 if ((parms1 & 0x00008000) != 0)
599 m_scene.RegionInfo.EstateSettings.PublicAccess = true; 599 m_scene.RegionInfo.EstateSettings.PublicAccess = true;
600 else 600 else
601 m_scene.RegionInfo.EstateSettings.PublicAccess = false; 601 m_scene.RegionInfo.EstateSettings.PublicAccess = false;
602 602
603 if((parms1 & 0x10000000) != 0) 603 if ((parms1 & 0x10000000) != 0)
604 m_scene.RegionInfo.EstateSettings.AllowVoice = true; 604 m_scene.RegionInfo.EstateSettings.AllowVoice = true;
605 else 605 else
606 m_scene.RegionInfo.EstateSettings.AllowVoice = false; 606 m_scene.RegionInfo.EstateSettings.AllowVoice = false;
607 607
608 if((parms1 & 0x00100000) != 0) 608 if ((parms1 & 0x00100000) != 0)
609 m_scene.RegionInfo.EstateSettings.AllowDirectTeleport = true; 609 m_scene.RegionInfo.EstateSettings.AllowDirectTeleport = true;
610 else 610 else
611 m_scene.RegionInfo.EstateSettings.AllowDirectTeleport = false; 611 m_scene.RegionInfo.EstateSettings.AllowDirectTeleport = false;
612 612
613 if((parms1 & 0x00800000) != 0) 613 if ((parms1 & 0x00800000) != 0)
614 m_scene.RegionInfo.EstateSettings.DenyAnonymous = true; 614 m_scene.RegionInfo.EstateSettings.DenyAnonymous = true;
615 else 615 else
616 m_scene.RegionInfo.EstateSettings.DenyAnonymous = false; 616 m_scene.RegionInfo.EstateSettings.DenyAnonymous = false;
617 617
618 if((parms1 & 0x01000000) != 0) 618 if ((parms1 & 0x01000000) != 0)
619 m_scene.RegionInfo.EstateSettings.DenyIdentified = true; 619 m_scene.RegionInfo.EstateSettings.DenyIdentified = true;
620 else 620 else
621 m_scene.RegionInfo.EstateSettings.DenyIdentified = false; 621 m_scene.RegionInfo.EstateSettings.DenyIdentified = false;
622 622
623 if((parms1 & 0x02000000) != 0) 623 if ((parms1 & 0x02000000) != 0)
624 m_scene.RegionInfo.EstateSettings.DenyTransacted = true; 624 m_scene.RegionInfo.EstateSettings.DenyTransacted = true;
625 else 625 else
626 m_scene.RegionInfo.EstateSettings.DenyTransacted = false; 626 m_scene.RegionInfo.EstateSettings.DenyTransacted = false;
@@ -628,10 +628,10 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
628 m_scene.RegionInfo.EstateSettings.Save(); 628 m_scene.RegionInfo.EstateSettings.Save();
629 629
630 float sun = (float)m_scene.RegionInfo.RegionSettings.SunPosition; 630 float sun = (float)m_scene.RegionInfo.RegionSettings.SunPosition;
631 if(m_scene.RegionInfo.RegionSettings.UseEstateSun) 631 if (m_scene.RegionInfo.RegionSettings.UseEstateSun)
632 { 632 {
633 sun = (float)m_scene.RegionInfo.EstateSettings.SunPosition; 633 sun = (float)m_scene.RegionInfo.EstateSettings.SunPosition;
634 if(m_scene.RegionInfo.EstateSettings.UseGlobalTime) 634 if (m_scene.RegionInfo.EstateSettings.UseGlobalTime)
635 sun = m_scene.EventManager.GetSunLindenHour(); 635 sun = m_scene.EventManager.GetSunLindenHour();
636 } 636 }
637 637
@@ -726,30 +726,30 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
726 726
727 // Fully implemented 727 // Fully implemented
728 // 728 //
729 if(m_scene.RegionInfo.RegionSettings.AllowDamage) 729 if (m_scene.RegionInfo.RegionSettings.AllowDamage)
730 flags |= Simulator.RegionFlags.AllowDamage; 730 flags |= Simulator.RegionFlags.AllowDamage;
731 if(m_scene.RegionInfo.RegionSettings.BlockTerraform) 731 if (m_scene.RegionInfo.RegionSettings.BlockTerraform)
732 flags |= Simulator.RegionFlags.BlockTerraform; 732 flags |= Simulator.RegionFlags.BlockTerraform;
733 if(!m_scene.RegionInfo.RegionSettings.AllowLandResell) 733 if (!m_scene.RegionInfo.RegionSettings.AllowLandResell)
734 flags |= Simulator.RegionFlags.BlockLandResell; 734 flags |= Simulator.RegionFlags.BlockLandResell;
735 if(m_scene.RegionInfo.RegionSettings.DisableCollisions) 735 if (m_scene.RegionInfo.RegionSettings.DisableCollisions)
736 flags |= Simulator.RegionFlags.SkipCollisions; 736 flags |= Simulator.RegionFlags.SkipCollisions;
737 if(m_scene.RegionInfo.RegionSettings.DisableScripts) 737 if (m_scene.RegionInfo.RegionSettings.DisableScripts)
738 flags |= Simulator.RegionFlags.SkipScripts; 738 flags |= Simulator.RegionFlags.SkipScripts;
739 if(m_scene.RegionInfo.RegionSettings.DisablePhysics) 739 if (m_scene.RegionInfo.RegionSettings.DisablePhysics)
740 flags |= Simulator.RegionFlags.SkipPhysics; 740 flags |= Simulator.RegionFlags.SkipPhysics;
741 if(m_scene.RegionInfo.RegionSettings.BlockFly) 741 if (m_scene.RegionInfo.RegionSettings.BlockFly)
742 flags |= Simulator.RegionFlags.NoFly; 742 flags |= Simulator.RegionFlags.NoFly;
743 if(m_scene.RegionInfo.RegionSettings.RestrictPushing) 743 if (m_scene.RegionInfo.RegionSettings.RestrictPushing)
744 flags |= Simulator.RegionFlags.RestrictPushObject; 744 flags |= Simulator.RegionFlags.RestrictPushObject;
745 if(m_scene.RegionInfo.RegionSettings.AllowLandJoinDivide) 745 if (m_scene.RegionInfo.RegionSettings.AllowLandJoinDivide)
746 flags |= Simulator.RegionFlags.AllowParcelChanges; 746 flags |= Simulator.RegionFlags.AllowParcelChanges;
747 if(m_scene.RegionInfo.RegionSettings.BlockShowInSearch) 747 if (m_scene.RegionInfo.RegionSettings.BlockShowInSearch)
748 flags |= (Simulator.RegionFlags)(1 << 29); 748 flags |= (Simulator.RegionFlags)(1 << 29);
749 749
750 if(m_scene.RegionInfo.RegionSettings.FixedSun) 750 if (m_scene.RegionInfo.RegionSettings.FixedSun)
751 flags |= Simulator.RegionFlags.SunFixed; 751 flags |= Simulator.RegionFlags.SunFixed;
752 if(m_scene.RegionInfo.RegionSettings.Sandbox) 752 if (m_scene.RegionInfo.RegionSettings.Sandbox)
753 flags |= Simulator.RegionFlags.Sandbox; 753 flags |= Simulator.RegionFlags.Sandbox;
754 754
755 // Handled in LandObject.cs: AllowLandmark 755 // Handled in LandObject.cs: AllowLandmark
@@ -769,30 +769,30 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
769 { 769 {
770 Simulator.RegionFlags flags = Simulator.RegionFlags.None; 770 Simulator.RegionFlags flags = Simulator.RegionFlags.None;
771 771
772 if(m_scene.RegionInfo.EstateSettings.FixedSun) 772 if (m_scene.RegionInfo.EstateSettings.FixedSun)
773 flags |= Simulator.RegionFlags.SunFixed; 773 flags |= Simulator.RegionFlags.SunFixed;
774 if(m_scene.RegionInfo.EstateSettings.PublicAccess) 774 if (m_scene.RegionInfo.EstateSettings.PublicAccess)
775 flags |= (Simulator.RegionFlags.PublicAllowed | 775 flags |= (Simulator.RegionFlags.PublicAllowed |
776 Simulator.RegionFlags.ExternallyVisible); 776 Simulator.RegionFlags.ExternallyVisible);
777 if(m_scene.RegionInfo.EstateSettings.AllowVoice) 777 if (m_scene.RegionInfo.EstateSettings.AllowVoice)
778 flags |= Simulator.RegionFlags.AllowVoice; 778 flags |= Simulator.RegionFlags.AllowVoice;
779 if(m_scene.RegionInfo.EstateSettings.AllowDirectTeleport) 779 if (m_scene.RegionInfo.EstateSettings.AllowDirectTeleport)
780 flags |= Simulator.RegionFlags.AllowDirectTeleport; 780 flags |= Simulator.RegionFlags.AllowDirectTeleport;
781 if(m_scene.RegionInfo.EstateSettings.DenyAnonymous) 781 if (m_scene.RegionInfo.EstateSettings.DenyAnonymous)
782 flags |= Simulator.RegionFlags.DenyAnonymous; 782 flags |= Simulator.RegionFlags.DenyAnonymous;
783 if(m_scene.RegionInfo.EstateSettings.DenyIdentified) 783 if (m_scene.RegionInfo.EstateSettings.DenyIdentified)
784 flags |= Simulator.RegionFlags.DenyIdentified; 784 flags |= Simulator.RegionFlags.DenyIdentified;
785 if(m_scene.RegionInfo.EstateSettings.DenyTransacted) 785 if (m_scene.RegionInfo.EstateSettings.DenyTransacted)
786 flags |= Simulator.RegionFlags.DenyTransacted; 786 flags |= Simulator.RegionFlags.DenyTransacted;
787 if(m_scene.RegionInfo.EstateSettings.AbuseEmailToEstateOwner) 787 if (m_scene.RegionInfo.EstateSettings.AbuseEmailToEstateOwner)
788 flags |= Simulator.RegionFlags.AbuseEmailToEstateOwner; 788 flags |= Simulator.RegionFlags.AbuseEmailToEstateOwner;
789 if(m_scene.RegionInfo.EstateSettings.BlockDwell) 789 if (m_scene.RegionInfo.EstateSettings.BlockDwell)
790 flags |= Simulator.RegionFlags.BlockDwell; 790 flags |= Simulator.RegionFlags.BlockDwell;
791 if(m_scene.RegionInfo.EstateSettings.EstateSkipScripts) 791 if (m_scene.RegionInfo.EstateSettings.EstateSkipScripts)
792 flags |= Simulator.RegionFlags.EstateSkipScripts; 792 flags |= Simulator.RegionFlags.EstateSkipScripts;
793 if(m_scene.RegionInfo.EstateSettings.ResetHomeOnTeleport) 793 if (m_scene.RegionInfo.EstateSettings.ResetHomeOnTeleport)
794 flags |= Simulator.RegionFlags.ResetHomeOnTeleport; 794 flags |= Simulator.RegionFlags.ResetHomeOnTeleport;
795 if(m_scene.RegionInfo.EstateSettings.TaxFree) 795 if (m_scene.RegionInfo.EstateSettings.TaxFree)
796 flags |= Simulator.RegionFlags.TaxFree; 796 flags |= Simulator.RegionFlags.TaxFree;
797 797
798 return (uint)flags; 798 return (uint)flags;
@@ -804,7 +804,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
804 return true; 804 return true;
805 805
806 List<LLUUID> ems = new List<LLUUID>(m_scene.RegionInfo.EstateSettings.EstateManagers); 806 List<LLUUID> ems = new List<LLUUID>(m_scene.RegionInfo.EstateSettings.EstateManagers);
807 if(ems.Contains(avatarID)) 807 if (ems.Contains(avatarID))
808 return true; 808 return true;
809 809
810 return false; 810 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
163 { 163 {
164 IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>(); 164 IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>();
165 uint regionFlags = 336723974 & ~((uint)(Simulator.RegionFlags.AllowLandmark | Simulator.RegionFlags.AllowSetHome)); 165 uint regionFlags = 336723974 & ~((uint)(Simulator.RegionFlags.AllowLandmark | Simulator.RegionFlags.AllowSetHome));
166 if(estateModule != null) 166 if (estateModule != null)
167 regionFlags = estateModule.GetRegionFlags(); 167 regionFlags = estateModule.GetRegionFlags();
168 if((landData.landFlags & (uint)Parcel.ParcelFlags.AllowLandmark) != 0) 168 if ((landData.landFlags & (uint)Parcel.ParcelFlags.AllowLandmark) != 0)
169 regionFlags |= (uint)Simulator.RegionFlags.AllowLandmark; 169 regionFlags |= (uint)Simulator.RegionFlags.AllowLandmark;
170 if(landData.ownerID == remote_client.AgentId) 170 if (landData.ownerID == remote_client.AgentId)
171 regionFlags |= (uint)Simulator.RegionFlags.AllowSetHome; 171 regionFlags |= (uint)Simulator.RegionFlags.AllowSetHome;
172 remote_client.SendLandProperties(remote_client, sequence_id, 172 remote_client.SendLandProperties(remote_client, sequence_id,
173 snap_selection, request_result, landData, 173 snap_selection, request_result, landData,