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

Added display of script compilation errors on ScriptEngine's concole (log), 

as temp solution for getting the errors.
dsg
Huaiyu (Kitty) Liu 2011-05-27 14:43:04 -07:00
parent d375491142
commit 83e3a6a59a
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/ScriptEngineSyncModule.cs
View File

@ -22,6 +22,7 @@
*/ */
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using Nini.Config; using Nini.Config;
@ -210,14 +211,36 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
{ {
m_log.Debug(LogHeader + " ScriptEngine_OnUpdateScript"); m_log.Debug(LogHeader + " ScriptEngine_OnUpdateScript");
m_scene.SymSync_OnNewScript(agentID, itemID, part); ArrayList errors = m_scene.SymSync_OnNewScript(agentID, itemID, part);
//The errors should be sent back to the client's viewer who submitted
//the new script. But for now, let just display it in concole and
//log it.
LogScriptErrors(errors);
} }
//Assumption, when this function is triggered, the new script asset has already been saved. //Assumption, when this function is triggered, the new script asset has already been saved.
public void ScriptEngine_OnUpdateScript(UUID agentID, UUID itemID, UUID primID, bool isScriptRunning, UUID newAssetID) public void ScriptEngine_OnUpdateScript(UUID agentID, UUID itemID, UUID primID, bool isScriptRunning, UUID newAssetID)
{ {
m_log.Debug(LogHeader + " ScriptEngine_OnUpdateScript"); m_log.Debug(LogHeader + " ScriptEngine_OnUpdateScript");
m_scene.SymSync_OnUpdateScript(agentID, itemID, primID, isScriptRunning, newAssetID); ArrayList errors = m_scene.SymSync_OnUpdateScript(agentID, itemID, primID, isScriptRunning, newAssetID);
//The errors should be sent back to the client's viewer who submitted
//the script update. But for now, let just display it in concole and
//log it.
LogScriptErrors(errors);
}
private void LogScriptErrors(ArrayList errors)
{
string errorString = "";
foreach (Object err in errors)
{
errorString += err + "\n";
}
if (errorString != String.Empty)
{
m_log.ErrorFormat("Error in script: {0}", errorString);
}
} }
public void ScriptEngine_OnAggregateScriptEvents(SceneObjectPart part) public void ScriptEngine_OnAggregateScriptEvents(SceneObjectPart part)

5
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -371,12 +371,15 @@ namespace OpenSim.Region.Framework.Scenes
#endregion #endregion
#region DSG SYNC #region DSG SYNC
public void SymSync_OnNewScript(UUID avatarID, UUID itemID, SceneObjectPart part) public ArrayList SymSync_OnNewScript(UUID avatarID, UUID itemID, SceneObjectPart part)
{ {
TaskInventoryItem item = part.Inventory.GetInventoryItem(itemID); TaskInventoryItem item = part.Inventory.GetInventoryItem(itemID);
part.Inventory.CreateScriptInstance(item, 0, false, DefaultScriptEngine, 0); part.Inventory.CreateScriptInstance(item, 0, false, DefaultScriptEngine, 0);
part.ParentGroup.ResumeScripts(); part.ParentGroup.ResumeScripts();
ArrayList errors = part.Inventory.GetScriptErrors(itemID);
return errors;
} }
//only a script engine actor is supposed to call this function //only a script engine actor is supposed to call this function