aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712007-12-11 13:30:08 +0000
committerlbsa712007-12-11 13:30:08 +0000
commitffd60baa4898efd1175dc551b9b1288820edfb61 (patch)
treec500d1363d23d71b45e75113a8f5f6db2d02bfb2
parentImplementing updateinventoryfolder: Should now be able to rename folders in i... (diff)
downloadopensim-SC_OLD-ffd60baa4898efd1175dc551b9b1288820edfb61.zip
opensim-SC_OLD-ffd60baa4898efd1175dc551b9b1288820edfb61.tar.gz
opensim-SC_OLD-ffd60baa4898efd1175dc551b9b1288820edfb61.tar.bz2
opensim-SC_OLD-ffd60baa4898efd1175dc551b9b1288820edfb61.tar.xz
* The 'Create' functions should be called to factor up a new, otherwise empty, but with the Id and 1-to-1 child fields instantiated and randomized.
* Added two shape constants that
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs12
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs2
3 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index a9da7c8..8081ee7 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -129,6 +129,12 @@ namespace OpenSim.Framework
129 TextureEntry = m_defaultTextureEntry; 129 TextureEntry = m_defaultTextureEntry;
130 } 130 }
131 131
132 public static PrimitiveBaseShape Create()
133 {
134 PrimitiveBaseShape shape = new PrimitiveBaseShape();
135 return shape;
136 }
137
132 //void returns need to change of course 138 //void returns need to change of course
133 public virtual void GetMesh() 139 public virtual void GetMesh()
134 { 140 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 3a4129e..abdbe4d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -774,6 +774,17 @@ namespace OpenSim.Region.Environment.Scenes
774 return LLUUID.Zero; 774 return LLUUID.Zero;
775 } 775 }
776 776
777 public static SceneObjectPart Create()
778 {
779 SceneObjectPart part = new SceneObjectPart();
780 part.UUID = LLUUID.Random();
781
782 PrimitiveBaseShape shape = PrimitiveBaseShape.Create();
783 part.Shape = shape;
784
785 return part;
786 }
787
777 #region Copying 788 #region Copying
778 789
779 /// <summary> 790 /// <summary>
@@ -1603,6 +1614,7 @@ namespace OpenSim.Region.Environment.Scenes
1603 public TaskInventoryItem() 1614 public TaskInventoryItem()
1604 { 1615 {
1605 } 1616 }
1617
1606 } 1618 }
1607 } 1619 }
1608} 1620}
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
index 1dbbeea..deabec3 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
@@ -2040,6 +2040,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
2040 public const int PRIM_FULLBRIGHT = 20; 2040 public const int PRIM_FULLBRIGHT = 20;
2041 public const int PRIM_FLEXIBLE = 21; 2041 public const int PRIM_FLEXIBLE = 21;
2042 public const int PRIM_TEXGEN = 22; 2042 public const int PRIM_TEXGEN = 22;
2043 public const int PRIM_CAST_SHADOWS = 24; // Not implemented, here for completeness sake
2044 public const int PRIM_POINT_LIGHT = 23; // Huh?
2043 public const int PRIM_TEXGEN_DEFAULT = 0; 2045 public const int PRIM_TEXGEN_DEFAULT = 0;
2044 public const int PRIM_TEXGEN_PLANAR = 1; 2046 public const int PRIM_TEXGEN_PLANAR = 1;
2045 public const int PRIM_TYPE_BOX = 0; 2047 public const int PRIM_TYPE_BOX = 0;