diff options
| author | Melanie | 2012-02-24 09:56:06 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-24 09:56:06 +0000 |
| commit | 37068d17c5a6a4679f75af12cbbcfc3c78790e33 (patch) | |
| tree | 42454c2fd6072b0baebb4f3d7632476de3ad18e9 /OpenSim/Region/Physics/OdePlugin | |
| parent | Partially apply the core banlines fix (diff) | |
| parent | Take watchdog alarm calling back outside the m_threads lock. (diff) | |
| download | opensim-SC-37068d17c5a6a4679f75af12cbbcfc3c78790e33.zip opensim-SC-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.gz opensim-SC-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.bz2 opensim-SC-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 62e3763..254d578 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -1474,6 +1474,8 @@ Console.WriteLine("CreateGeom:"); | |||
| 1474 | /// </summary> | 1474 | /// </summary> |
| 1475 | private void changeadd() | 1475 | private void changeadd() |
| 1476 | { | 1476 | { |
| 1477 | // m_log.DebugFormat("[ODE PRIM]: Adding prim {0}", Name); | ||
| 1478 | |||
| 1477 | int[] iprimspaceArrItem = _parent_scene.calculateSpaceArrayItemFromPos(_position); | 1479 | int[] iprimspaceArrItem = _parent_scene.calculateSpaceArrayItemFromPos(_position); |
| 1478 | IntPtr targetspace = _parent_scene.calculateSpaceForGeom(_position); | 1480 | IntPtr targetspace = _parent_scene.calculateSpaceForGeom(_position); |
| 1479 | 1481 | ||