diff options
| author | Melanie | 2012-07-16 22:22:42 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-16 22:22:42 +0100 |
| commit | c256447f46db1738131763960c9394f03b072c46 (patch) | |
| tree | 277255a693b3ce62366816338482a602d7d979bf /OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Allow setting linked avatar positions from within a prim not the one sat on (diff) | |
| download | opensim-SC-c256447f46db1738131763960c9394f03b072c46.zip opensim-SC-c256447f46db1738131763960c9394f03b072c46.tar.gz opensim-SC-c256447f46db1738131763960c9394f03b072c46.tar.bz2 opensim-SC-c256447f46db1738131763960c9394f03b072c46.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs index e900c02..a7dda7a 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs | |||
| @@ -425,7 +425,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 425 | switch (pParam) | 425 | switch (pParam) |
| 426 | { | 426 | { |
| 427 | case Vehicle.REFERENCE_FRAME: | 427 | case Vehicle.REFERENCE_FRAME: |
| 428 | m_referenceFrame = Quaternion.Inverse(pValue); | 428 | // m_referenceFrame = Quaternion.Inverse(pValue); |
| 429 | m_referenceFrame = pValue; | ||
| 429 | break; | 430 | break; |
| 430 | case Vehicle.ROLL_FRAME: | 431 | case Vehicle.ROLL_FRAME: |
| 431 | m_RollreferenceFrame = pValue; | 432 | m_RollreferenceFrame = pValue; |