Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
2026-08-06 01:06:30 +08:00 · 2012-04-25 02:33:39 +01:00
parent def65cd94a 683cfc6f82
commit 9a23501824
5 changed files with 40 additions and 11 deletions
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -192,7 +192,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                        m_log.WarnFormat(
                            "[ENTITY TRANSFER MODULE]: RequestTeleportToLocation() was given an illegal position of {0} for avatar {1}, {2}.  Substituting {3}",
                            position, sp.Name, sp.UUID, emergencyPos);
-                        
+
                        position = emergencyPos;
                    }