Merge commit 'b45219065c7a81b3ec488b3a6734773c34268618' into bigmerge

Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
author: Melanie 2011-10-25 03:07:25 +0100
committer: Melanie 2011-10-25 03:07:25 +0100
commit: 1bb0e3c800bdf72ae0e846cf74263e65d50931b8 (patch)
tree: edab91415612e4fa4cdca4ceffbc07feb4a7ecd3 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
parent: Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge (diff)
parent: on log and "show scripts" messages, show script item UUID rather than asset UUID (diff)
download: opensim-SC_OLD-1bb0e3c800bdf72ae0e846cf74263e65d50931b8.zip
opensim-SC_OLD-1bb0e3c800bdf72ae0e846cf74263e65d50931b8.tar.gz
opensim-SC_OLD-1bb0e3c800bdf72ae0e846cf74263e65d50931b8.tar.bz2
opensim-SC_OLD-1bb0e3c800bdf72ae0e846cf74263e65d50931b8.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index d606b37..6c3d767 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -374,8 +374,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                    }
                    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);
                }
            }
author	Melanie	2011-10-25 03:07:25 +0100
committer	Melanie	2011-10-25 03:07:25 +0100
commit	1bb0e3c800bdf72ae0e846cf74263e65d50931b8 (patch)
tree	edab91415612e4fa4cdca4ceffbc07feb4a7ecd3 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
parent	Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge (diff)
parent	on log and "show scripts" messages, show script item UUID rather than asset UUID (diff)
download	opensim-SC_OLD-1bb0e3c800bdf72ae0e846cf74263e65d50931b8.zip opensim-SC_OLD-1bb0e3c800bdf72ae0e846cf74263e65d50931b8.tar.gz opensim-SC_OLD-1bb0e3c800bdf72ae0e846cf74263e65d50931b8.tar.bz2 opensim-SC_OLD-1bb0e3c800bdf72ae0e846cf74263e65d50931b8.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index d606b37..6c3d767 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -374,8 +374,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
374	}	374	}
375		375
376	MainConsole.Instance.OutputFormat(	376	MainConsole.Instance.OutputFormat(
377	"{0}.{1}, script UUID {2}, prim UUID {3} @ {4} ({5})",	377	"{0}.{1}, item UUID {2}, prim UUID {3} @ {4} ({5})",
378	instance.PrimName, instance.ScriptName, instance.AssetID, instance.ObjectID,	378	instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID,
379	sop.AbsolutePosition, status);	379	sop.AbsolutePosition, status);
380	}	380	}
381	}	381	}