diff options
| author | Kitto Flora | 2009-12-22 00:33:31 -0500 |
|---|---|---|
| committer | Kitto Flora | 2009-12-22 00:33:31 -0500 |
| commit | 93b930b9370b1439c4416c08a45fe7f23a5862c7 (patch) | |
| tree | e3546d86b64e9e2c13c4fba40a364857bfb0a8e7 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Include ChOdePlugin (diff) | |
| parent | Should not commit without compiling (diff) | |
| download | opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.zip opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.gz opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.bz2 opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.xz | |
Fix conflicts
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -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 0eddbfd..6b562e5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -2684,7 +2684,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2684 | ParentGroup.HasGroupChanged = true; | 2684 | ParentGroup.HasGroupChanged = true; |
| 2685 | ScheduleFullUpdate(); | 2685 | ScheduleFullUpdate(); |
| 2686 | } | 2686 | } |
| 2687 | 2687 | ||
| 2688 | /// <summary> | 2688 | /// <summary> |
| 2689 | /// Set the text displayed for this part. | 2689 | /// Set the text displayed for this part. |
| 2690 | /// </summary> | 2690 | /// </summary> |