aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Primitive.cs
diff options
context:
space:
mode:
authorMW2007-07-01 21:45:47 +0000
committerMW2007-07-01 21:45:47 +0000
commit7f18f494f1200f0f6470020a794e5291124f3ead (patch)
tree3807166ff2432b3b5c7d9913ecabff8103175757 /OpenSim/Region/Environment/Scenes/Primitive.cs
parent* removed try-catchall from scene constructor (diff)
downloadopensim-SC-7f18f494f1200f0f6470020a794e5291124f3ead.zip
opensim-SC-7f18f494f1200f0f6470020a794e5291124f3ead.tar.gz
opensim-SC-7f18f494f1200f0f6470020a794e5291124f3ead.tar.bz2
opensim-SC-7f18f494f1200f0f6470020a794e5291124f3ead.tar.xz
Just committing this because I want my commit to be on the front page of www.opensimulator.org rather than lbsa71's being there.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Primitive.cs6
1 files changed, 3 insertions, 3 deletions
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)