OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

avinationmerge
ubit 2012-10-10 01:58:06 +02:00
parent a271afa2aa 8fa91686db
commit 62fd29bd9a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
View File

@ -646,6 +646,8 @@ namespace OpenSim.Region.Physics.OdePlugin
if (value.Length() > 1.01f || qlen <0.99) if (value.Length() > 1.01f || qlen <0.99)
m_log.WarnFormat("[PHYSICS]: Got nonnorm quaternion Orientation from Scene in Object {0} norm {1}", Name, qlen); m_log.WarnFormat("[PHYSICS]: Got nonnorm quaternion Orientation from Scene in Object {0} norm {1}", Name, qlen);
// //
value.Normalize();
AddChange(changes.Orientation, value); AddChange(changes.Orientation, value);
} }
else else
@ -2252,6 +2254,7 @@ namespace OpenSim.Region.Physics.OdePlugin
if (qlen > 1.01f || qlen < 0.99) if (qlen > 1.01f || qlen < 0.99)
m_log.WarnFormat("[PHYSICS]: Got nonnorm quaternion from geom in Object {0} norm {1}", Name, qlen); m_log.WarnFormat("[PHYSICS]: Got nonnorm quaternion from geom in Object {0} norm {1}", Name, qlen);
// //
_orientation.Normalize();
d.Vector3 lpos = d.GeomGetPosition(prim_geom); d.Vector3 lpos = d.GeomGetPosition(prim_geom);
_position.X = lpos.X; _position.X = lpos.X;