Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-10-09 20:43:59 +02:00
commit 9ad670e82c
1 changed files with 5 additions and 2 deletions

View File

@ -733,8 +733,11 @@ namespace OpenSim.Region.Physics.OdePlugin
if (!actor_name_map.TryGetValue(g2, out dp2)) if (!actor_name_map.TryGetValue(g2, out dp2))
m_log.WarnFormat("[PHYSICS]: failed actor mapping for geom 2"); m_log.WarnFormat("[PHYSICS]: failed actor mapping for geom 2");
else else
m_log.WarnFormat("[PHYSICS]: land versus large prim geo {0},size {1}, AABBsize <{2},{3},{4}>, at {5}", m_log.WarnFormat("[PHYSICS]: land versus large prim geo {0},size {1}, AABBsize <{2},{3},{4}>, at {5} ori {6},({7})",
dp2.Name, dp2.Size, x, y, z, dp2.Position); dp2.Name, dp2.Size, x, y, z,
dp2.Position.ToString(),
dp2.Orientation.ToString(),
dp2.Orientation.Length());
return; return;
} }
} }