aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie Thielker2010-07-02 03:11:18 +0200
committerMelanie Thielker2010-07-02 03:11:18 +0200
commit120c9a4ebb3ef2fefca12a49043ab9760535e3cd (patch)
tree6e37ce225a4357e0f57a22da684e91132efbdd97 /OpenSim/Region/ScriptEngine
parentFix a dumb little sign error that makes a LSL wiki example fail (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-120c9a4ebb3ef2fefca12a49043ab9760535e3cd.zip
opensim-SC_OLD-120c9a4ebb3ef2fefca12a49043ab9760535e3cd.tar.gz
opensim-SC_OLD-120c9a4ebb3ef2fefca12a49043ab9760535e3cd.tar.bz2
opensim-SC_OLD-120c9a4ebb3ef2fefca12a49043ab9760535e3cd.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index bbaf923..a6ab5e9 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -840,8 +840,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
840 item.Name, startParam, postOnRez, 840 item.Name, startParam, postOnRez,
841 stateSource, m_MaxScriptQueue); 841 stateSource, m_MaxScriptQueue);
842 842
843 m_log.DebugFormat("[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}", 843 m_log.DebugFormat(
844 part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, part.ParentGroup.RootPart.AbsolutePosition.ToString()); 844 "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}",
845 part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID,
846 part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName);
845 847
846 if (presence != null) 848 if (presence != null)
847 { 849 {