aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorRobert Adams2011-08-18 15:27:03 -0700
committerJustin Clark-Casey (justincc)2011-08-19 00:53:57 +0100
commitbb5b396fc5ac15d7451df407e75c2ca99c0b9dd1 (patch)
treef6024a5d2bccaafed6b07d3e3e8e42aeb3757618 /OpenSim/Region/Framework
parentStop NPC's getting hypergrid like names in some circumstances. (diff)
downloadopensim-SC_OLD-bb5b396fc5ac15d7451df407e75c2ca99c0b9dd1.zip
opensim-SC_OLD-bb5b396fc5ac15d7451df407e75c2ca99c0b9dd1.tar.gz
opensim-SC_OLD-bb5b396fc5ac15d7451df407e75c2ca99c0b9dd1.tar.bz2
opensim-SC_OLD-bb5b396fc5ac15d7451df407e75c2ca99c0b9dd1.tar.xz
Fix exception when using BasicPhysics
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 7778ebc..a0e87d0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1603,7 +1603,6 @@ namespace OpenSim.Region.Framework.Scenes
1603 RotationOffset, 1603 RotationOffset,
1604 RigidBody, 1604 RigidBody,
1605 m_localId); 1605 m_localId);
1606 PhysActor.SetMaterial(Material);
1607 } 1606 }
1608 catch 1607 catch
1609 { 1608 {
@@ -1615,6 +1614,7 @@ namespace OpenSim.Region.Framework.Scenes
1615 { 1614 {
1616 PhysActor.SOPName = this.Name; // save object name and desc into the PhysActor so ODE internals know the joint/body info 1615 PhysActor.SOPName = this.Name; // save object name and desc into the PhysActor so ODE internals know the joint/body info
1617 PhysActor.SOPDescription = this.Description; 1616 PhysActor.SOPDescription = this.Description;
1617 PhysActor.SetMaterial(Material);
1618 DoPhysicsPropertyUpdate(RigidBody, true); 1618 DoPhysicsPropertyUpdate(RigidBody, true);
1619 PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0); 1619 PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0);
1620 } 1620 }
@@ -4530,11 +4530,11 @@ namespace OpenSim.Region.Framework.Scenes
4530 RotationOffset, 4530 RotationOffset,
4531 UsePhysics, 4531 UsePhysics,
4532 m_localId); 4532 m_localId);
4533 PhysActor.SetMaterial(Material);
4534 4533
4535 pa = PhysActor; 4534 pa = PhysActor;
4536 if (pa != null) 4535 if (pa != null)
4537 { 4536 {
4537 PhysActor.SetMaterial(Material);
4538 DoPhysicsPropertyUpdate(UsePhysics, true); 4538 DoPhysicsPropertyUpdate(UsePhysics, true);
4539 4539
4540 if (m_parentGroup != null) 4540 if (m_parentGroup != null)