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

Merge commit 'b45219065c7a81b3ec488b3a6734773c34268618' into bigmerge 

Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
avinationmerge
Melanie 2011-10-25 03:07:25 +01:00
parent 1ec82bb000 b45219065c
commit 1bb0e3c800
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -374,8 +374,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
} }
MainConsole.Instance.OutputFormat( MainConsole.Instance.OutputFormat(
"{0}.{1}, script UUID {2}, prim UUID {3} @ {4} ({5})", "{0}.{1}, item UUID {2}, prim UUID {3} @ {4} ({5})",
instance.PrimName, instance.ScriptName, instance.AssetID, instance.ObjectID, instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID,
sop.AbsolutePosition, status); sop.AbsolutePosition, status);
} }
} }