aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-19 20:26:05 +0100
committerJustin Clark-Casey (justincc)2011-10-19 20:26:05 +0100
commitb45219065c7a81b3ec488b3a6734773c34268618 (patch)
tree48e4b9deb6d6f8da6a94f7de2edc58d92499558d
parentadd current script status to "scripts show" command (running, suspended, etc.) (diff)
downloadopensim-SC_OLD-b45219065c7a81b3ec488b3a6734773c34268618.zip
opensim-SC_OLD-b45219065c7a81b3ec488b3a6734773c34268618.tar.gz
opensim-SC_OLD-b45219065c7a81b3ec488b3a6734773c34268618.tar.bz2
opensim-SC_OLD-b45219065c7a81b3ec488b3a6734773c34268618.tar.xz
on log and "show scripts" messages, show script item UUID rather than asset UUID
The item ID is the one required for any script manipulation on the command line, so I think it's somewhat more useful to show this bearing in mind the limited space available
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index c74cd64..304848e 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -306,8 +306,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
306 } 306 }
307 307
308 MainConsole.Instance.OutputFormat( 308 MainConsole.Instance.OutputFormat(
309 "{0}.{1}, script UUID {2}, prim UUID {3} @ {4} ({5})", 309 "{0}.{1}, item UUID {2}, prim UUID {3} @ {4} ({5})",
310 instance.PrimName, instance.ScriptName, instance.AssetID, instance.ObjectID, 310 instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID,
311 sop.AbsolutePosition, status); 311 sop.AbsolutePosition, status);
312 } 312 }
313 } 313 }
@@ -840,8 +840,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
840 stateSource, m_MaxScriptQueue); 840 stateSource, m_MaxScriptQueue);
841 841
842 m_log.DebugFormat( 842 m_log.DebugFormat(
843 "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}", 843 "[XEngine] Loaded script {0}.{1}, item UUID {2}, prim UUID {3} @ {4}.{5}",
844 part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, 844 part.ParentGroup.RootPart.Name, item.Name, itemID, part.UUID,
845 part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName); 845 part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName);
846 846
847 if (presence != null) 847 if (presence != null)