diff options
| author | Tom Grimshaw | 2010-07-03 06:11:46 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-07-03 06:11:46 -0700 |
| commit | e4739523d3a9f19a0af385b64fb81fcd83a3a175 (patch) | |
| tree | 95a602904a1c0234725d1e4386eadeecfe34b364 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
| parent | Fix Undo! Made a lot of changes to Undo state saving; it now considers that ... (diff) | |
| parent | Now, fix the slash issue the right way. Our URLs now work like SL's (diff) | |
| download | opensim-SC-e4739523d3a9f19a0af385b64fb81fcd83a3a175.zip opensim-SC-e4739523d3a9f19a0af385b64fb81fcd83a3a175.tar.gz opensim-SC-e4739523d3a9f19a0af385b64fb81fcd83a3a175.tar.bz2 opensim-SC-e4739523d3a9f19a0af385b64fb81fcd83a3a175.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
| -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 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 | { |