aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2010-11-09 22:16:48 +0000
committerMelanie2010-11-09 22:16:48 +0000
commitee85a530f6401a7be15778f15f0e2319c714c3d4 (patch)
treece3d924fe0d4c8679731c78ea8090c6ca022bdcb /OpenSim/Region/Framework/Scenes
parentFix parcel bans to work only on the avatars they're supposed to work on inste... (diff)
parentFix parcel bans to work only on the avatars they're supposed to work on inste... (diff)
downloadopensim-SC_OLD-ee85a530f6401a7be15778f15f0e2319c714c3d4.zip
opensim-SC_OLD-ee85a530f6401a7be15778f15f0e2319c714c3d4.tar.gz
opensim-SC_OLD-ee85a530f6401a7be15778f15f0e2319c714c3d4.tar.bz2
opensim-SC_OLD-ee85a530f6401a7be15778f15f0e2319c714c3d4.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b637317..cc9c445 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1270,7 +1270,7 @@ namespace OpenSim.Region.Framework.Scenes
1270 1270
1271 m_log.DebugFormat( 1271 m_log.DebugFormat(
1272 "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 1272 "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms",
1273 client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); 1273 client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
1274 } 1274 }
1275 1275
1276 /// <summary> 1276 /// <summary>