OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update svn properties, minor formatting cleanup.

0.6.3-post-fixes
Jeff Ames 2009-01-30 09:03:23 +00:00
parent 7e17cec182
commit 6126c687c1
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
View File

@ -386,7 +386,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
attendees.Count, scene.RegionInfo.RegionName, attendees.Count, scene.RegionInfo.RegionName,
scene.RegionInfo.RegionID, scene.RegionInfo.RegionID,
DateTime.UtcNow.ToString("s"))); DateTime.UtcNow.ToString("s")));
foreach(UUID uuid in attendees) foreach (UUID uuid in attendees)
{ {
string name = _attendeeNames[uuid]; string name = _attendeeNames[uuid];
list.Append(String.Format(" <avatar name=\"{0}\" uuid=\"{1}\" />\n", name, uuid)); list.Append(String.Format(" <avatar name=\"{0}\" uuid=\"{1}\" />\n", name, uuid));

26
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -454,9 +454,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
else else
{ {
m_CurrentCompile = null; m_CurrentCompile = null;
m_Scene.EventManager.TriggerEmptyScriptCompileQueue(m_ScriptFailCount, m_Scene.EventManager.TriggerEmptyScriptCompileQueue(m_ScriptFailCount,
m_ScriptErrorMessage); m_ScriptErrorMessage);
m_ScriptFailCount = 0; m_ScriptFailCount = 0;
} }
} }
return null; return null;
@ -482,18 +482,18 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if (part == null) if (part == null)
{ {
Log.Error("[Script] SceneObjectPart unavailable. Script NOT started."); Log.Error("[Script] SceneObjectPart unavailable. Script NOT started.");
m_ScriptErrorMessage += "SceneObjectPart unavailable. Script NOT started.\n"; m_ScriptErrorMessage += "SceneObjectPart unavailable. Script NOT started.\n";
m_ScriptFailCount++; m_ScriptFailCount++;
return false; return false;
} }
TaskInventoryItem item = part.Inventory.GetInventoryItem(itemID); TaskInventoryItem item = part.Inventory.GetInventoryItem(itemID);
if (item == null) if (item == null)
{ {
m_ScriptErrorMessage += "Can't find script inventory item.\n"; m_ScriptErrorMessage += "Can't find script inventory item.\n";
m_ScriptFailCount++; m_ScriptFailCount++;
return false; return false;
} }
UUID assetID = item.AssetID; UUID assetID = item.AssetID;
@ -519,8 +519,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
try try
{ {
// DISPLAY ERROR INWORLD // DISPLAY ERROR INWORLD
m_ScriptErrorMessage += "Failed to compile: " + e.Message.ToString(); m_ScriptErrorMessage += "Failed to compile: " + e.Message.ToString();
m_ScriptFailCount++; m_ScriptFailCount++;
string text = "Error compiling script:\n" + e.Message.ToString(); string text = "Error compiling script:\n" + e.Message.ToString();
if (text.Length > 1000) if (text.Length > 1000)
text = text.Substring(0, 1000); text = text.Substring(0, 1000);
@ -590,8 +590,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
catch (Exception e) catch (Exception e)
{ {
m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString()); m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString());
m_ScriptErrorMessage += "Exception creating app domain:\n"; m_ScriptErrorMessage += "Exception creating app domain:\n";
m_ScriptFailCount++; m_ScriptFailCount++;
return false; return false;
} }
} }