From 6126c687c16f6aadc7b4690354ddee5fedac4bcd Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Fri, 30 Jan 2009 09:03:23 +0000
Subject: Update svn properties, minor formatting cleanup.
---
.../Modules/Avatar/Concierge/ConciergeModule.cs | 2 +-
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 26 +++++++++++-----------
2 files changed, 14 insertions(+), 14 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
index 06d6c8d..1f07355 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
@@ -386,7 +386,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
attendees.Count, scene.RegionInfo.RegionName,
scene.RegionInfo.RegionID,
DateTime.UtcNow.ToString("s")));
- foreach(UUID uuid in attendees)
+ foreach (UUID uuid in attendees)
{
string name = _attendeeNames[uuid];
list.Append(String.Format(" <avatar name=\"{0}\" uuid=\"{1}\" />\n", name, uuid));
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index a0a0037..7a52205 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -454,9 +454,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
else
{
m_CurrentCompile = null;
- m_Scene.EventManager.TriggerEmptyScriptCompileQueue(m_ScriptFailCount,
- m_ScriptErrorMessage);
- m_ScriptFailCount = 0;
+ m_Scene.EventManager.TriggerEmptyScriptCompileQueue(m_ScriptFailCount,
+ m_ScriptErrorMessage);
+ m_ScriptFailCount = 0;
}
}
return null;
@@ -482,18 +482,18 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if (part == null)
{
Log.Error("[Script] SceneObjectPart unavailable. Script NOT started.");
- m_ScriptErrorMessage += "SceneObjectPart unavailable. Script NOT started.\n";
- m_ScriptFailCount++;
+ m_ScriptErrorMessage += "SceneObjectPart unavailable. Script NOT started.\n";
+ m_ScriptFailCount++;
return false;
}
TaskInventoryItem item = part.Inventory.GetInventoryItem(itemID);
if (item == null)
- {
- m_ScriptErrorMessage += "Can't find script inventory item.\n";
- m_ScriptFailCount++;
+ {
+ m_ScriptErrorMessage += "Can't find script inventory item.\n";
+ m_ScriptFailCount++;
return false;
- }
+ }
UUID assetID = item.AssetID;
@@ -519,8 +519,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
try
{
// DISPLAY ERROR INWORLD
- m_ScriptErrorMessage += "Failed to compile: " + e.Message.ToString();
- m_ScriptFailCount++;
+ m_ScriptErrorMessage += "Failed to compile: " + e.Message.ToString();
+ m_ScriptFailCount++;
string text = "Error compiling script:\n" + e.Message.ToString();
if (text.Length > 1000)
text = text.Substring(0, 1000);
@@ -590,8 +590,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
catch (Exception e)
{
m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString());
- m_ScriptErrorMessage += "Exception creating app domain:\n";
- m_ScriptFailCount++;
+ m_ScriptErrorMessage += "Exception creating app domain:\n";
+ m_ScriptFailCount++;
return false;
}
}
--
cgit v1.1