aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2012-04-03 23:22:47 +0200
committerMelanie2012-04-03 23:22:47 +0200
commitdbec5e98595cfe87d26ef74703433db7956ab66d (patch)
treef08d1aa4eaba984778e3738a8dc86832d10881b0 /OpenSim/Region/Framework
parentRemove duplicate implementation of Material { get; set; } (diff)
downloadopensim-SC_OLD-dbec5e98595cfe87d26ef74703433db7956ab66d.zip
opensim-SC_OLD-dbec5e98595cfe87d26ef74703433db7956ab66d.tar.gz
opensim-SC_OLD-dbec5e98595cfe87d26ef74703433db7956ab66d.tar.bz2
opensim-SC_OLD-dbec5e98595cfe87d26ef74703433db7956ab66d.tar.xz
Fix more merge artefacts
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 5c28d89..9cd438c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4837,11 +4837,11 @@ namespace OpenSim.Region.Framework.Scenes
4837 { 4837 {
4838 // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like 4838 // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like
4839 // (mumbles, well, at least if you have infinte CPU powers :-)) 4839 // (mumbles, well, at least if you have infinte CPU powers :-))
4840 if (this.PhysActor != null) 4840 if (pa != null)
4841 { 4841 {
4842 PhysActor.SetVolumeDetect(0); 4842 PhysActor.SetVolumeDetect(0);
4843 4843 this.VolumeDetectActive = false;
4844 this.VolumeDetectActive = false; 4844 }
4845 } 4845 }
4846 4846
4847 if (SetTemporary) 4847 if (SetTemporary)