aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-08-17 22:30:01 +0100
committerJustin Clark-Casey (justincc)2012-08-17 22:30:01 +0100
commit0860a0d856ee667bf20db074b778f2518c4d061c (patch)
tree3325df1843ac3d4bf488d5683335281429ea1e1c
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-0860a0d856ee667bf20db074b778f2518c4d061c.zip
opensim-SC-0860a0d856ee667bf20db074b778f2518c4d061c.tar.gz
opensim-SC-0860a0d856ee667bf20db074b778f2518c4d061c.tar.bz2
opensim-SC-0860a0d856ee667bf20db074b778f2518c4d061c.tar.xz
minor: Make xengine debug message on script load a scripting loading message instead.
This is more useful if compilation fails due to an uncatchable exception since we know what was being compiled.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs16
1 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 2dba029..1571fb4 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -982,10 +982,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
982 return false; 982 return false;
983 } 983 }
984 984
985 UUID assetID = item.AssetID; 985 m_log.DebugFormat(
986 "[XEngine] Loading script {0}.{1}, item UUID {2}, prim UUID {3} @ {4}.{5}",
987 part.ParentGroup.RootPart.Name, item.Name, itemID, part.UUID,
988 part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName);
986 989
987 //m_log.DebugFormat("[XEngine] Compiling script {0} ({1} on object {2})", 990 UUID assetID = item.AssetID;
988 // item.Name, itemID.ToString(), part.ParentGroup.RootPart.Name);
989 991
990 ScenePresence presence = m_Scene.GetScenePresence(item.OwnerID); 992 ScenePresence presence = m_Scene.GetScenePresence(item.OwnerID);
991 993
@@ -1164,10 +1166,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1164 stateSource, m_MaxScriptQueue); 1166 stateSource, m_MaxScriptQueue);
1165 1167
1166// if (DebugLevel >= 1) 1168// if (DebugLevel >= 1)
1167 m_log.DebugFormat( 1169// m_log.DebugFormat(
1168 "[XEngine] Loaded script {0}.{1}, item UUID {2}, prim UUID {3} @ {4}.{5}", 1170// "[XEngine] Loaded script {0}.{1}, item UUID {2}, prim UUID {3} @ {4}.{5}",
1169 part.ParentGroup.RootPart.Name, item.Name, itemID, part.UUID, 1171// part.ParentGroup.RootPart.Name, item.Name, itemID, part.UUID,
1170 part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName); 1172// part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName);
1171 1173
1172 if (presence != null) 1174 if (presence != null)
1173 { 1175 {