diff options
| author | Diva Canto | 2009-09-28 17:35:26 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-09-28 17:35:26 -0700 |
| commit | 51d9f7ebd4286709e75f6fcceff6fb75a4a83c46 (patch) | |
| tree | 032929778f7dc07b560c75da262f285476a44450 /OpenSim/Region/Framework | |
| parent | Improved the Local grid connector to fetch data from the DB when it doesn't f... (diff) | |
| parent | Convert DOS newlines to Unix newlines. (diff) | |
| download | opensim-SC-51d9f7ebd4286709e75f6fcceff6fb75a4a83c46.zip opensim-SC-51d9f7ebd4286709e75f6fcceff6fb75a4a83c46.tar.gz opensim-SC-51d9f7ebd4286709e75f6fcceff6fb75a4a83c46.tar.bz2 opensim-SC-51d9f7ebd4286709e75f6fcceff6fb75a4a83c46.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 51bb114..ec262b0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -3517,7 +3517,7 @@ if (m_shape != null) { | |||
| 3517 | } | 3517 | } |
| 3518 | else | 3518 | else |
| 3519 | { // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like | 3519 | { // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like |
| 3520 | // (mumbles, well, at least if you have infinte CPU powers :-) ) | 3520 | // (mumbles, well, at least if you have infinte CPU powers :-)) |
| 3521 | PhysicsActor pa = this.PhysActor; | 3521 | PhysicsActor pa = this.PhysActor; |
| 3522 | if (pa != null) | 3522 | if (pa != null) |
| 3523 | { | 3523 | { |