diff options
| author | Melanie | 2012-03-12 11:45:38 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-12 11:45:38 +0100 |
| commit | bfd38ecad49dc9976e816b484bb9e2a1c729b1cb (patch) | |
| tree | ef3ca09b6ba1880f3ed3d5f914a5a5e0030f8dca /OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |
| parent | Add AVATAR_MALE flag to return values of llGetAgentInfo (diff) | |
| parent | allocate UndoRedoStore only on demand (diff) | |
| download | opensim-SC_OLD-bfd38ecad49dc9976e816b484bb9e2a1c729b1cb.zip opensim-SC_OLD-bfd38ecad49dc9976e816b484bb9e2a1c729b1cb.tar.gz opensim-SC_OLD-bfd38ecad49dc9976e816b484bb9e2a1c729b1cb.tar.bz2 opensim-SC_OLD-bfd38ecad49dc9976e816b484bb9e2a1c729b1cb.tar.xz | |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index b111172..612eafd 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |||
| @@ -128,6 +128,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 128 | VolumeDtc, | 128 | VolumeDtc, |
| 129 | 129 | ||
| 130 | Physical, | 130 | Physical, |
| 131 | Phantom, | ||
| 131 | Selected, | 132 | Selected, |
| 132 | disabled, | 133 | disabled, |
| 133 | building, | 134 | building, |