aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/InnerScene.cs
diff options
context:
space:
mode:
authorSean Dague2008-03-05 18:57:13 +0000
committerSean Dague2008-03-05 18:57:13 +0000
commit4ea52b2105491d417a978e903f6926fd58bd890a (patch)
tree404a17b5649c823d9f46f7c88d204fc0ebe1832a /OpenSim/Region/Environment/Scenes/InnerScene.cs
parent* New Terrain Module (disabled, search for 'usingTerrainModule = false' to re... (diff)
downloadopensim-SC-4ea52b2105491d417a978e903f6926fd58bd890a.zip
opensim-SC-4ea52b2105491d417a978e903f6926fd58bd890a.tar.gz
opensim-SC-4ea52b2105491d417a978e903f6926fd58bd890a.tar.bz2
opensim-SC-4ea52b2105491d417a978e903f6926fd58bd890a.tar.xz
Change SceneObjectPart.LocalID to .LocalId to be case matching
with SceneObjectGroup.LocalId (and hence reduce confusion).
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 882e589..02d0e20 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -186,7 +186,7 @@ namespace OpenSim.Region.Environment.Scenes
186 sceneObject.SetScene(m_parentScene); 186 sceneObject.SetScene(m_parentScene);
187 foreach (SceneObjectPart part in sceneObject.Children.Values) 187 foreach (SceneObjectPart part in sceneObject.Children.Values)
188 { 188 {
189 part.LocalID = m_parentScene.PrimIDAllocate(); 189 part.LocalId = m_parentScene.PrimIDAllocate();
190 190
191 } 191 }
192 sceneObject.UpdateParentIDs(); 192 sceneObject.UpdateParentIDs();
@@ -378,7 +378,7 @@ namespace OpenSim.Region.Environment.Scenes
378 378
379 379
380 objupdate.ObjectData[1].UpdateFlags = 276957500; // flags; // ?? 380 objupdate.ObjectData[1].UpdateFlags = 276957500; // flags; // ??
381 objupdate.ObjectData[1].ID = p.LocalID; 381 objupdate.ObjectData[1].ID = p.LocalId;
382 objupdate.ObjectData[1].FullID = p.UUID; 382 objupdate.ObjectData[1].FullID = p.UUID;
383 objupdate.ObjectData[1].OwnerID = p.OwnerID; 383 objupdate.ObjectData[1].OwnerID = p.OwnerID;
384 objupdate.ObjectData[1].Text = Helpers.StringToField(p.Text); 384 objupdate.ObjectData[1].Text = Helpers.StringToField(p.Text);