diff options
| author | Diva Canto | 2010-07-02 06:36:08 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-07-02 06:36:08 -0700 |
| commit | 79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53 (patch) | |
| tree | 94689bae9d0813616dc9f487824d17d8954f0414 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
| parent | Fixes mantis #4782 (diff) | |
| parent | Clean up IMoneyModule and adjust the other modules to the changes (diff) | |
| download | opensim-SC_OLD-79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53.zip opensim-SC_OLD-79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53.tar.gz opensim-SC_OLD-79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53.tar.bz2 opensim-SC_OLD-79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 808cf82..bc5df11 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -770,8 +770,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 770 | item.Name, startParam, postOnRez, | 770 | item.Name, startParam, postOnRez, |
| 771 | stateSource, m_MaxScriptQueue); | 771 | stateSource, m_MaxScriptQueue); |
| 772 | 772 | ||
| 773 | m_log.DebugFormat("[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}", | 773 | m_log.DebugFormat( |
| 774 | part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, part.ParentGroup.RootPart.AbsolutePosition.ToString()); | 774 | "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}", |
| 775 | part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, | ||
| 776 | part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName); | ||
| 775 | 777 | ||
| 776 | if (presence != null) | 778 | if (presence != null) |
| 777 | { | 779 | { |