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 ++++++++++-----------
1 file changed, 133 insertions(+), 133 deletions(-)
(limited to 'OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs')
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;
}
-
- ///
" +
- "
Object-Name: " + LastObjectName +
- "
Region: " + LastObjectRegionName +
- "
Local-Position: " + LastObjectPosition + "
"
- +body+"\r\n
" +
+ "
Object-Name: " + LastObjectName +
+ "
Region: " + LastObjectRegionName +
+ "
Local-Position: " + LastObjectPosition + "
"
+ +body+"\r\n