Just committing this because I want my commit to be on the front page of www.opensimulator.org rather than lbsa71's being there.

author: MW 2007-07-01 21:45:47 +0000
committer: MW 2007-07-01 21:45:47 +0000
commit: 7f18f494f1200f0f6470020a794e5291124f3ead (patch)
tree: 3807166ff2432b3b5c7d9913ecabff8103175757
parent: * removed try-catchall from scene constructor (diff)
download: opensim-SC-7f18f494f1200f0f6470020a794e5291124f3ead.zip
opensim-SC-7f18f494f1200f0f6470020a794e5291124f3ead.tar.gz
opensim-SC-7f18f494f1200f0f6470020a794e5291124f3ead.tar.bz2
opensim-SC-7f18f494f1200f0f6470020a794e5291124f3ead.tar.xz
4 files changed, 76 insertions, 77 deletions
diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index 2343bc0..5f47b6b 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+# Visual C# Express 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"
@@ -25,72 +25,61 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"
 EndProject
 Global
-  GlobalSection(SolutionConfigurationPlatforms) = preSolution
+        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-    Debug|Any CPU = Debug|Any CPU
+                Debug|Any CPU = Debug|Any CPU
-    Release|Any CPU = Release|Any CPU
+                Release|Any CPU = Release|Any CPU
-  EndGlobalSection
+        EndGlobalSection
-  GlobalSection(ProjectDependencies) = postSolution
+        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-    ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+                {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    ({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
+                {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    ({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+                {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    ({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
+                {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+                {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    ({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+                {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    ({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000})
+                {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    ({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+                {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    ({2FC96F92-0000-0000-0000-000000000000}).7 = ({586E2916-0000-0000-0000-000000000000})
+                {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-  EndGlobalSection
+                {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-  GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        EndGlobalSection
-    {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        GlobalSection(SolutionProperties) = preSolution
-    {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                HideSolutionNode = FALSE
-    {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+        EndGlobalSection
-    {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-  EndGlobalSection
-  GlobalSection(SolutionProperties) = preSolution
-    HideSolutionNode = FALSE
-  EndGlobalSection
 EndGlobal
diff --git a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
index 7c8de16..584bc9b 100644
--- a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
@@ -16,12 +16,13 @@ namespace OpenSim.Framework.Types
        Torus,
        Prism,
        Scuplted,
-        Cylinder
+        Cylinder,
+        Unknown
    }
    public class PrimitiveBaseShape
    {
-        private ShapeType type;
+        private ShapeType type = ShapeType.Unknown;
        public byte PCode;
        public ushort PathBegin;
diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs
index dd8bb02..b8ec68b 100644
--- a/OpenSim/Region/Environment/Scenes/Primitive.cs
+++ b/OpenSim/Region/Environment/Scenes/Primitive.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Environment.Scenes
        /// </summary>
        public override void update() 
        {
-            if (this.updateFlag == 1) // is a new prim just been created/reloaded 
+            if (this.updateFlag == 1) // is a new prim just been created/reloaded or has major changes
            {
                this.SendFullUpdateToAllClients();
                this.updateFlag = 0;
@@ -151,7 +151,7 @@ namespace OpenSim.Region.Environment.Scenes
            this.updateFlag = 1;
        }
-        public void AddToChildren(SceneObject linkObject)
+        public void AddNewChildren(SceneObject linkObject)
        {
           // Console.WriteLine("linking new prims " + linkObject.rootLocalID + " to me (" + this.LocalId + ")");
            //TODO check permissions
@@ -159,7 +159,7 @@ namespace OpenSim.Region.Environment.Scenes
            linkObject.rootPrimitive.SetNewParent(this, this.m_RootParent);
            this.m_world.DeleteEntity(linkObject.rootUUID);
-            linkObject.rootPrimitive = null;
+            linkObject.DeleteAllChildren();
        }
        public void SetNewParent(Primitive newParent, SceneObject rootParent)
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index 2c55a7d..c03354e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Environment.Scenes
            m_regionHandle = regionHandle;
            m_world = world;
            this.Pos = addPacket.ObjectData.RayEnd;
-            this.CreateFromPacket(addPacket, ownerID, localID);
+            this.CreateRootFromPacket(addPacket, ownerID, localID);
        }
        /// <summary>
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Environment.Scenes
        /// <param name="addPacket"></param>
        /// <param name="agentID"></param>
        /// <param name="localID"></param>
-        public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID)
+        public void CreateRootFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID)
        {
           this.rootPrimitive = new Primitive( this.m_regionHandle, this.m_world, addPacket, agentID, localID, true, this, this);
           this.children.Add(rootPrimitive);
@@ -99,6 +99,15 @@ namespace OpenSim.Region.Environment.Scenes
        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public void DeleteAllChildren()
+        {
+            this.children.Clear();
+            this.ChildPrimitives.Clear();
+            this.rootPrimitive = null;
+        }
        /// <summary>
        /// 
@@ -106,7 +115,7 @@ namespace OpenSim.Region.Environment.Scenes
        /// <param name="primObject"></param>
        public void AddNewChildPrims(SceneObject primObject)
        {
-            this.rootPrimitive.AddToChildren(primObject);
+            this.rootPrimitive.AddNewChildren(primObject);
        }
        /// <summary>
author	MW	2007-07-01 21:45:47 +0000
committer	MW	2007-07-01 21:45:47 +0000
commit	7f18f494f1200f0f6470020a794e5291124f3ead (patch)
tree	3807166ff2432b3b5c7d9913ecabff8103175757
parent	* removed try-catchall from scene constructor (diff)
download	opensim-SC-7f18f494f1200f0f6470020a794e5291124f3ead.zip opensim-SC-7f18f494f1200f0f6470020a794e5291124f3ead.tar.gz opensim-SC-7f18f494f1200f0f6470020a794e5291124f3ead.tar.bz2 opensim-SC-7f18f494f1200f0f6470020a794e5291124f3ead.tar.xz

diff --git a/OpenGridServices.sln b/OpenGridServices.sln index 2343bc0..5f47b6b 100644 --- a/OpenGridServices.sln +++ b/OpenGridServices.sln
@@ -1,5 +1,5 @@
1	Microsoft Visual Studio Solution File, Format Version 9.00	1	Microsoft Visual Studio Solution File, Format Version 9.00
2	# Visual Studio 2005	2	# Visual C# Express 2005
3	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"	3	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
4	EndProject	4	EndProject
5	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"	5	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"
@@ -25,72 +25,61 @@ EndProject
25	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"	25	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"
26	EndProject	26	EndProject
27	Global	27	Global
28	GlobalSection(SolutionConfigurationPlatforms) = preSolution	28	GlobalSection(SolutionConfigurationPlatforms) = preSolution
29	Debug\|Any CPU = Debug\|Any CPU	29	Debug\|Any CPU = Debug\|Any CPU
30	Release\|Any CPU = Release\|Any CPU	30	Release\|Any CPU = Release\|Any CPU
31	EndGlobalSection	31	EndGlobalSection
32	GlobalSection(ProjectDependencies) = postSolution	32	GlobalSection(ProjectConfigurationPlatforms) = postSolution
33	({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})	33	{36B72A9B-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
34	({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})	34	{36B72A9B-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
35	({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})	35	{36B72A9B-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
36	({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})	36	{36B72A9B-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
37	({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})	37	{FD2D303D-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
38	({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})	38	{FD2D303D-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
39	({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000})	39	{FD2D303D-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
40	({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})	40	{FD2D303D-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
41	({2FC96F92-0000-0000-0000-000000000000}).7 = ({586E2916-0000-0000-0000-000000000000})	41	{17F7F694-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
42	EndGlobalSection	42	{17F7F694-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
43	GlobalSection(ProjectConfigurationPlatforms) = postSolution	43	{17F7F694-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
44	{36B72A9B-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	44	{17F7F694-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
45	{36B72A9B-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	45	{17F7F6BE-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
46	{36B72A9B-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	46	{17F7F6BE-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
47	{36B72A9B-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	47	{17F7F6BE-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
48	{FD2D303D-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	48	{17F7F6BE-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
49	{FD2D303D-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	49	{6ECC56A9-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
50	{FD2D303D-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	50	{6ECC56A9-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
51	{FD2D303D-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	51	{6ECC56A9-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
52	{17F7F694-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	52	{6ECC56A9-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
53	{17F7F694-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	53	{586E2916-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
54	{17F7F694-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	54	{586E2916-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
55	{17F7F694-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	55	{586E2916-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
56	{17F7F6BE-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	56	{586E2916-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
57	{17F7F6BE-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	57	{E5F1A03B-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
58	{17F7F6BE-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	58	{E5F1A03B-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
59	{17F7F6BE-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	59	{E5F1A03B-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
60	{6ECC56A9-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	60	{E5F1A03B-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
61	{6ECC56A9-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	61	{4B7BFD1C-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
62	{6ECC56A9-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	62	{4B7BFD1C-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
63	{6ECC56A9-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	63	{4B7BFD1C-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
64	{586E2916-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	64	{4B7BFD1C-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
65	{586E2916-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	65	{60FCC3A6-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
66	{586E2916-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	66	{60FCC3A6-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
67	{586E2916-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	67	{60FCC3A6-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
68	{E5F1A03B-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	68	{60FCC3A6-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
69	{E5F1A03B-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	69	{1442B635-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
70	{E5F1A03B-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	70	{1442B635-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
71	{E5F1A03B-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	71	{1442B635-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
72	{4B7BFD1C-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	72	{1442B635-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
73	{4B7BFD1C-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	73	{2FC96F92-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
74	{4B7BFD1C-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	74	{2FC96F92-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
75	{4B7BFD1C-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	75	{2FC96F92-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
76	{60FCC3A6-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	76	{2FC96F92-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
77	{60FCC3A6-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	77	{08F87229-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
78	{60FCC3A6-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	78	{08F87229-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
79	{60FCC3A6-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	79	{08F87229-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
80	{1442B635-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	80	{08F87229-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
81	{1442B635-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	81	EndGlobalSection
82	{1442B635-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	82	GlobalSection(SolutionProperties) = preSolution
83	{1442B635-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	83	HideSolutionNode = FALSE
84	{2FC96F92-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	84	EndGlobalSection
85	{2FC96F92-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
86	{2FC96F92-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
87	{2FC96F92-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
88	{08F87229-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
89	{08F87229-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
90	{08F87229-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
91	{08F87229-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
92	EndGlobalSection
93	GlobalSection(SolutionProperties) = preSolution
94	HideSolutionNode = FALSE
95	EndGlobalSection
96	EndGlobal	85	EndGlobal


diff --git a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs index 7c8de16..584bc9b 100644 --- a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
@@ -16,12 +16,13 @@ namespace OpenSim.Framework.Types
16	Torus,	16	Torus,
17	Prism,	17	Prism,
18	Scuplted,	18	Scuplted,
19	Cylinder	19	Cylinder,
		20	Unknown
20	}	21	}
21		22
22	public class PrimitiveBaseShape	23	public class PrimitiveBaseShape
23	{	24	{
24	private ShapeType type;	25	private ShapeType type = ShapeType.Unknown;
25		26
26	public byte PCode;	27	public byte PCode;
27	public ushort PathBegin;	28	public ushort PathBegin;


diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs index dd8bb02..b8ec68b 100644 --- a/OpenSim/Region/Environment/Scenes/Primitive.cs +++ b/OpenSim/Region/Environment/Scenes/Primitive.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Environment.Scenes
94	/// </summary>	94	/// </summary>
95	public override void update()	95	public override void update()
96	{	96	{
97	if (this.updateFlag == 1) // is a new prim just been created/reloaded	97	if (this.updateFlag == 1) // is a new prim just been created/reloaded or has major changes
98	{	98	{
99	this.SendFullUpdateToAllClients();	99	this.SendFullUpdateToAllClients();
100	this.updateFlag = 0;	100	this.updateFlag = 0;
@@ -151,7 +151,7 @@ namespace OpenSim.Region.Environment.Scenes
151	this.updateFlag = 1;	151	this.updateFlag = 1;
152	}	152	}
153		153
154	public void AddToChildren(SceneObject linkObject)	154	public void AddNewChildren(SceneObject linkObject)
155	{	155	{
156	// Console.WriteLine("linking new prims " + linkObject.rootLocalID + " to me (" + this.LocalId + ")");	156	// Console.WriteLine("linking new prims " + linkObject.rootLocalID + " to me (" + this.LocalId + ")");
157	//TODO check permissions	157	//TODO check permissions
@@ -159,7 +159,7 @@ namespace OpenSim.Region.Environment.Scenes
159	linkObject.rootPrimitive.SetNewParent(this, this.m_RootParent);	159	linkObject.rootPrimitive.SetNewParent(this, this.m_RootParent);
160		160
161	this.m_world.DeleteEntity(linkObject.rootUUID);	161	this.m_world.DeleteEntity(linkObject.rootUUID);
162	linkObject.rootPrimitive = null;	162	linkObject.DeleteAllChildren();
163	}	163	}
164		164
165	public void SetNewParent(Primitive newParent, SceneObject rootParent)	165	public void SetNewParent(Primitive newParent, SceneObject rootParent)


diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs index 2c55a7d..c03354e 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObject.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Environment.Scenes
74	m_regionHandle = regionHandle;	74	m_regionHandle = regionHandle;
75	m_world = world;	75	m_world = world;
76	this.Pos = addPacket.ObjectData.RayEnd;	76	this.Pos = addPacket.ObjectData.RayEnd;
77	this.CreateFromPacket(addPacket, ownerID, localID);	77	this.CreateRootFromPacket(addPacket, ownerID, localID);
78		78
79	}	79	}
80	/// <summary>	80	/// <summary>
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Environment.Scenes
83	/// <param name="addPacket"></param>	83	/// <param name="addPacket"></param>
84	/// <param name="agentID"></param>	84	/// <param name="agentID"></param>
85	/// <param name="localID"></param>	85	/// <param name="localID"></param>
86	public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID)	86	public void CreateRootFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID)
87	{	87	{
88	this.rootPrimitive = new Primitive( this.m_regionHandle, this.m_world, addPacket, agentID, localID, true, this, this);	88	this.rootPrimitive = new Primitive( this.m_regionHandle, this.m_world, addPacket, agentID, localID, true, this, this);
89	this.children.Add(rootPrimitive);	89	this.children.Add(rootPrimitive);
@@ -99,6 +99,15 @@ namespace OpenSim.Region.Environment.Scenes
99		99
100	}	100	}
101		101
		102	/// <summary>
		103	///
		104	/// </summary>
		105	public void DeleteAllChildren()
		106	{
		107	this.children.Clear();
		108	this.ChildPrimitives.Clear();
		109	this.rootPrimitive = null;
		110	}
102		111
103	/// <summary>	112	/// <summary>
104	///	113	///
@@ -106,7 +115,7 @@ namespace OpenSim.Region.Environment.Scenes
106	/// <param name="primObject"></param>	115	/// <param name="primObject"></param>
107	public void AddNewChildPrims(SceneObject primObject)	116	public void AddNewChildPrims(SceneObject primObject)
108	{	117	{
109	this.rootPrimitive.AddToChildren(primObject);	118	this.rootPrimitive.AddNewChildren(primObject);
110	}	119	}
111		120
112	/// <summary>	121	/// <summary>