aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/InnerScene.cs
diff options
context:
space:
mode:
authorJeff Ames2008-06-13 00:21:53 +0000
committerJeff Ames2008-06-13 00:21:53 +0000
commit64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94 (patch)
tree74c4e8fdc25dc28da7c63cbc9d97141c0f344938 /OpenSim/Region/Environment/Scenes/InnerScene.cs
parentlook mom, migrations in action. This adds a couple of indexes (diff)
downloadopensim-SC-64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94.zip
opensim-SC-64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94.tar.gz
opensim-SC-64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94.tar.bz2
opensim-SC-64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94.tar.xz
Update svn properties, clean up formatting, refactor out duplicate hard-coded port numbers.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index d09efd8..9bbfc3d 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -193,7 +193,7 @@ namespace OpenSim.Region.Environment.Scenes
193 { 193 {
194 sceneObject.RegionHandle = m_regInfo.RegionHandle; 194 sceneObject.RegionHandle = m_regInfo.RegionHandle;
195 sceneObject.SetScene(m_parentScene); 195 sceneObject.SetScene(m_parentScene);
196 196
197 foreach (SceneObjectPart part in sceneObject.Children.Values) 197 foreach (SceneObjectPart part in sceneObject.Children.Values)
198 { 198 {
199 part.LocalId = m_parentScene.PrimIDAllocate(); 199 part.LocalId = m_parentScene.PrimIDAllocate();
@@ -209,7 +209,7 @@ namespace OpenSim.Region.Environment.Scenes
209 /// </summary> 209 /// </summary>
210 /// <param name="sceneObject"></param> 210 /// <param name="sceneObject"></param>
211 /// <param name="attachToBackup"> 211 /// <param name="attachToBackup">
212 /// If true, the object is made persistent into the scene. 212 /// If true, the object is made persistent into the scene.
213 /// If false, the object will not persist over server restarts 213 /// If false, the object will not persist over server restarts
214 /// </param> 214 /// </param>
215 /// <returns>true if the object was added, false if an object with the same uuid was already in the scene 215 /// <returns>true if the object was added, false if an object with the same uuid was already in the scene
@@ -223,9 +223,9 @@ namespace OpenSim.Region.Environment.Scenes
223 // QuadTree.AddSceneObject(sceneObject); 223 // QuadTree.AddSceneObject(sceneObject);
224 Entities.Add(sceneObject.UUID, sceneObject); 224 Entities.Add(sceneObject.UUID, sceneObject);
225 m_numPrim += sceneObject.Children.Count; 225 m_numPrim += sceneObject.Children.Count;
226 226
227 if (attachToBackup) 227 if (attachToBackup)
228 sceneObject.AttachToBackup(); 228 sceneObject.AttachToBackup();
229 229
230 return true; 230 return true;
231 } 231 }