diff options
| author | Justin Clark-Casey (justincc) | 2011-11-21 17:47:30 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-11-21 17:47:30 +0000 |
| commit | e0887944a0fe1fa6d695a3dd7ca536ede9968de2 (patch) | |
| tree | 4326cab2ed84710af13de068575b6492c4a3188d /OpenSim | |
| parent | Instead of generating a new list for bad characters on every physics pass, ke... (diff) | |
| download | opensim-SC_OLD-e0887944a0fe1fa6d695a3dd7ca536ede9968de2.zip opensim-SC_OLD-e0887944a0fe1fa6d695a3dd7ca536ede9968de2.tar.gz opensim-SC_OLD-e0887944a0fe1fa6d695a3dd7ca536ede9968de2.tar.bz2 opensim-SC_OLD-e0887944a0fe1fa6d695a3dd7ca536ede9968de2.tar.xz | |
Remove unused PhysicsActor.SOPDescription
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 4e79311..d2b4fb2 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -909,15 +909,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 909 | public string Description | 909 | public string Description |
| 910 | { | 910 | { |
| 911 | get { return m_description; } | 911 | get { return m_description; } |
| 912 | set | 912 | set { m_description = value; } |
| 913 | { | ||
| 914 | m_description = value; | ||
| 915 | PhysicsActor actor = PhysActor; | ||
| 916 | if (actor != null) | ||
| 917 | { | ||
| 918 | actor.SOPDescription = value; | ||
| 919 | } | ||
| 920 | } | ||
| 921 | } | 913 | } |
| 922 | 914 | ||
| 923 | /// <value> | 915 | /// <value> |
| @@ -1543,8 +1535,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1543 | // Basic Physics returns null.. joy joy joy. | 1535 | // Basic Physics returns null.. joy joy joy. |
| 1544 | if (PhysActor != null) | 1536 | if (PhysActor != null) |
| 1545 | { | 1537 | { |
| 1546 | PhysActor.SOPName = this.Name; // save object name and desc into the PhysActor so ODE internals know the joint/body info | 1538 | PhysActor.SOPName = this.Name; // save object into the PhysActor so ODE internals know the joint/body info |
| 1547 | PhysActor.SOPDescription = this.Description; | ||
| 1548 | PhysActor.SetMaterial(Material); | 1539 | PhysActor.SetMaterial(Material); |
| 1549 | DoPhysicsPropertyUpdate(RigidBody, true); | 1540 | DoPhysicsPropertyUpdate(RigidBody, true); |
| 1550 | PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0); | 1541 | PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0); |