diff options
| author | Justin Clarke Casey | 2008-01-25 16:36:00 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-01-25 16:36:00 +0000 |
| commit | 75d91c387a47928be3b2c4f820cd51e3c4854fda (patch) | |
| tree | 5fc557b37456343089c493ba972bee218f5cefb5 /OpenSim | |
| parent | * Added Ubuntu to the OS detection routine. This seems to have helped on D... (diff) | |
| download | opensim-SC_OLD-75d91c387a47928be3b2c4f820cd51e3c4854fda.zip opensim-SC_OLD-75d91c387a47928be3b2c4f820cd51e3c4854fda.tar.gz opensim-SC_OLD-75d91c387a47928be3b2c4f820cd51e3c4854fda.tar.bz2 opensim-SC_OLD-75d91c387a47928be3b2c4f820cd51e3c4854fda.tar.xz | |
* Changing && to || as suggested by dirk and ChrisD, also looks sensible to me
* Please revert if this is wrong, Teravus
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index a4477cf..9d5731e 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -109,7 +109,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 109 | _acceleration = new PhysicsVector(); | 109 | _acceleration = new PhysicsVector(); |
| 110 | _parent_scene = parent_scene; | 110 | _parent_scene = parent_scene; |
| 111 | string etcreturn = Util.ReadEtcIssue(); | 111 | string etcreturn = Util.ReadEtcIssue(); |
| 112 | if (etcreturn.Contains("Debian") && etcreturn.Contains("Ubuntu")) | 112 | if (etcreturn.Contains("Debian") || etcreturn.Contains("Ubuntu")) |
| 113 | { | 113 | { |
| 114 | m_foundDebian = true; | 114 | m_foundDebian = true; |
| 115 | m_tensor = 14000000f; | 115 | m_tensor = 14000000f; |
| @@ -744,4 +744,4 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 744 | } | 744 | } |
| 745 | } | 745 | } |
| 746 | } | 746 | } |
| 747 | } \ No newline at end of file | 747 | } |