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/OdeApi.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 '')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs index 2341186..ee48db5 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs | |||
| @@ -61,6 +61,8 @@ namespace OdeAPI | |||
| 61 | public static int NTotalBodies = 0; | 61 | public static int NTotalBodies = 0; |
| 62 | public static int NTotalGeoms = 0; | 62 | public static int NTotalGeoms = 0; |
| 63 | 63 | ||
| 64 | public const uint CONTACTS_UNIMPORTANT = 0x80000000; | ||
| 65 | |||
| 64 | #region Flags and Enumerations | 66 | #region Flags and Enumerations |
| 65 | 67 | ||
| 66 | [Flags] | 68 | [Flags] |