aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJeff Ames2009-01-30 09:03:23 +0000
committerJeff Ames2009-01-30 09:03:23 +0000
commit6126c687c16f6aadc7b4690354ddee5fedac4bcd (patch)
treec75f954da6accc9e2aeb3d9d2cf61d20b6e4b253 /OpenSim/Region
parentremove dummy parcel media settings from event queue message (diff)
downloadopensim-SC_OLD-6126c687c16f6aadc7b4690354ddee5fedac4bcd.zip
opensim-SC_OLD-6126c687c16f6aadc7b4690354ddee5fedac4bcd.tar.gz
opensim-SC_OLD-6126c687c16f6aadc7b4690354ddee5fedac4bcd.tar.bz2
opensim-SC_OLD-6126c687c16f6aadc7b4690354ddee5fedac4bcd.tar.xz
Update svn properties, minor formatting cleanup.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs26
2 files changed, 14 insertions, 14 deletions
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
386 attendees.Count, scene.RegionInfo.RegionName, 386 attendees.Count, scene.RegionInfo.RegionName,
387 scene.RegionInfo.RegionID, 387 scene.RegionInfo.RegionID,
388 DateTime.UtcNow.ToString("s"))); 388 DateTime.UtcNow.ToString("s")));
389 foreach(UUID uuid in attendees) 389 foreach (UUID uuid in attendees)
390 { 390 {
391 string name = _attendeeNames[uuid]; 391 string name = _attendeeNames[uuid];
392 list.Append(String.Format(" <avatar name=\"{0}\" uuid=\"{1}\" />\n", name, uuid)); 392 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
454 else 454 else
455 { 455 {
456 m_CurrentCompile = null; 456 m_CurrentCompile = null;
457 m_Scene.EventManager.TriggerEmptyScriptCompileQueue(m_ScriptFailCount, 457 m_Scene.EventManager.TriggerEmptyScriptCompileQueue(m_ScriptFailCount,
458 m_ScriptErrorMessage); 458 m_ScriptErrorMessage);
459 m_ScriptFailCount = 0; 459 m_ScriptFailCount = 0;
460 } 460 }
461 } 461 }
462 return null; 462 return null;
@@ -482,18 +482,18 @@ namespace OpenSim.Region.ScriptEngine.XEngine
482 if (part == null) 482 if (part == null)
483 { 483 {
484 Log.Error("[Script] SceneObjectPart unavailable. Script NOT started."); 484 Log.Error("[Script] SceneObjectPart unavailable. Script NOT started.");
485 m_ScriptErrorMessage += "SceneObjectPart unavailable. Script NOT started.\n"; 485 m_ScriptErrorMessage += "SceneObjectPart unavailable. Script NOT started.\n";
486 m_ScriptFailCount++; 486 m_ScriptFailCount++;
487 return false; 487 return false;
488 } 488 }
489 489
490 TaskInventoryItem item = part.Inventory.GetInventoryItem(itemID); 490 TaskInventoryItem item = part.Inventory.GetInventoryItem(itemID);
491 if (item == null) 491 if (item == null)
492 { 492 {
493 m_ScriptErrorMessage += "Can't find script inventory item.\n"; 493 m_ScriptErrorMessage += "Can't find script inventory item.\n";
494 m_ScriptFailCount++; 494 m_ScriptFailCount++;
495 return false; 495 return false;
496 } 496 }
497 497
498 UUID assetID = item.AssetID; 498 UUID assetID = item.AssetID;
499 499
@@ -519,8 +519,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
519 try 519 try
520 { 520 {
521 // DISPLAY ERROR INWORLD 521 // DISPLAY ERROR INWORLD
522 m_ScriptErrorMessage += "Failed to compile: " + e.Message.ToString(); 522 m_ScriptErrorMessage += "Failed to compile: " + e.Message.ToString();
523 m_ScriptFailCount++; 523 m_ScriptFailCount++;
524 string text = "Error compiling script:\n" + e.Message.ToString(); 524 string text = "Error compiling script:\n" + e.Message.ToString();
525 if (text.Length > 1000) 525 if (text.Length > 1000)
526 text = text.Substring(0, 1000); 526 text = text.Substring(0, 1000);
@@ -590,8 +590,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
590 catch (Exception e) 590 catch (Exception e)
591 { 591 {
592 m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString()); 592 m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString());
593 m_ScriptErrorMessage += "Exception creating app domain:\n"; 593 m_ScriptErrorMessage += "Exception creating app domain:\n";
594 m_ScriptFailCount++; 594 m_ScriptFailCount++;
595 return false; 595 return false;
596 } 596 }
597 } 597 }