aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-10-11 22:53:27 +0100
committerMelanie2011-10-11 22:53:27 +0100
commit83ec0648686d5c725f2883f8ce96f41e5d184de6 (patch)
tree7207558dd60a04a487c732434df2c0f7f5de26af /OpenSim
parentMerge commit 'ceb09cde4ddaff6b7e76ce18656f0c2049bcb8ec' into bigmerge (diff)
parentremove unused SOP.Create() method (diff)
downloadopensim-SC_OLD-83ec0648686d5c725f2883f8ce96f41e5d184de6.zip
opensim-SC_OLD-83ec0648686d5c725f2883f8ce96f41e5d184de6.tar.gz
opensim-SC_OLD-83ec0648686d5c725f2883f8ce96f41e5d184de6.tar.bz2
opensim-SC_OLD-83ec0648686d5c725f2883f8ce96f41e5d184de6.tar.xz
Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs14
1 files changed, 0 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 97722b7..e6ec741 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1769,20 +1769,6 @@ namespace OpenSim.Region.Framework.Scenes
1769 Name, LocalId, id); 1769 Name, LocalId, id);
1770 } 1770 }
1771 1771
1772 public static SceneObjectPart Create()
1773 {
1774 SceneObjectPart part = new SceneObjectPart();
1775 part.UUID = UUID.Random();
1776
1777 PrimitiveBaseShape shape = PrimitiveBaseShape.Create();
1778 part.Shape = shape;
1779
1780 part.Name = "Object";
1781 part._ownerID = UUID.Random();
1782
1783 return part;
1784 }
1785
1786 /// <summary> 1772 /// <summary>
1787 /// Do a physics property update for a NINJA joint. 1773 /// Do a physics property update for a NINJA joint.
1788 /// </summary> 1774 /// </summary>