aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJeff Ames2008-05-25 23:27:38 +0000
committerJeff Ames2008-05-25 23:27:38 +0000
commit5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d (patch)
treeb010c015ac515fe2a3dd0c9f89c16cbc6383d685 /OpenSim/Region/Environment/Scenes/Scene.cs
parent* A hacky Top Scripts display. It isn't accurate as far as ms accounting, ho... (diff)
downloadopensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.zip
opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.gz
opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.bz2
opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.xz
Update svn properties. Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs34
1 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 1e88018..27431ed 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.Environment.Scenes
86 private int m_incrementsof15seconds = 0; 86 private int m_incrementsof15seconds = 0;
87 private volatile bool m_backingup = false; 87 private volatile bool m_backingup = false;
88 88
89 protected string m_simulatorVersion = "unknown"; 89 protected string m_simulatorVersion = "unknown";
90 90
91 protected ModuleLoader m_moduleLoader; 91 protected ModuleLoader m_moduleLoader;
92 protected StorageManager m_storageManager; 92 protected StorageManager m_storageManager;
@@ -218,7 +218,7 @@ namespace OpenSim.Region.Environment.Scenes
218 public Scene(RegionInfo regInfo, AgentCircuitManager authen, 218 public Scene(RegionInfo regInfo, AgentCircuitManager authen,
219 CommunicationsManager commsMan, SceneCommunicationService sceneGridService, 219 CommunicationsManager commsMan, SceneCommunicationService sceneGridService,
220 AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, 220 AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer,
221 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, 221 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim,
222 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) 222 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
223 { 223 {
224 m_config = config; 224 m_config = config;
@@ -287,7 +287,7 @@ namespace OpenSim.Region.Environment.Scenes
287 m_statsReporter.SetObjectCapacity(objectCapacity); 287 m_statsReporter.SetObjectCapacity(objectCapacity);
288 288
289 m_simulatorVersion = simulatorVersion 289 m_simulatorVersion = simulatorVersion
290 + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() 290 + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString()
291 + " PhysPrim:" + m_physicalPrim.ToString(); 291 + " PhysPrim:" + m_physicalPrim.ToString();
292 } 292 }
293 293
@@ -1322,7 +1322,7 @@ namespace OpenSim.Region.Environment.Scenes
1322 /// <summary> 1322 /// <summary>
1323 /// Add an object into the scene that has come from storage 1323 /// Add an object into the scene that has come from storage
1324 /// </summary> 1324 /// </summary>
1325 /// <param name="sceneObject"></param> 1325 /// <param name="sceneObject"></param>
1326 public void AddSceneObjectFromStorage(SceneObjectGroup sceneObject) 1326 public void AddSceneObjectFromStorage(SceneObjectGroup sceneObject)
1327 { 1327 {
1328 m_innerScene.AddSceneObjectFromStorage(sceneObject); 1328 m_innerScene.AddSceneObjectFromStorage(sceneObject);
@@ -1335,7 +1335,7 @@ namespace OpenSim.Region.Environment.Scenes
1335 public void AddSceneObject(SceneObjectGroup sceneObject) 1335 public void AddSceneObject(SceneObjectGroup sceneObject)
1336 { 1336 {
1337 m_innerScene.AddSceneObject(sceneObject); 1337 m_innerScene.AddSceneObject(sceneObject);
1338 } 1338 }
1339 1339
1340 /// <summary> 1340 /// <summary>
1341 /// Delete this object from the scene. 1341 /// Delete this object from the scene.
@@ -1344,20 +1344,20 @@ namespace OpenSim.Region.Environment.Scenes
1344 public void DeleteSceneObject(SceneObjectGroup group) 1344 public void DeleteSceneObject(SceneObjectGroup group)
1345 { 1345 {
1346 SceneObjectPart rootPart = (group).GetChildPart(group.UUID); 1346 SceneObjectPart rootPart = (group).GetChildPart(group.UUID);
1347 1347
1348 if (rootPart.PhysActor != null) 1348 if (rootPart.PhysActor != null)
1349 { 1349 {
1350 PhysicsScene.RemovePrim(rootPart.PhysActor); 1350 PhysicsScene.RemovePrim(rootPart.PhysActor);
1351 rootPart.PhysActor = null; 1351 rootPart.PhysActor = null;
1352 } 1352 }
1353 1353
1354 if (UnlinkSceneObject(group.UUID)) 1354 if (UnlinkSceneObject(group.UUID))
1355 { 1355 {
1356 EventManager.TriggerObjectBeingRemovedFromScene(group); 1356 EventManager.TriggerObjectBeingRemovedFromScene(group);
1357 EventManager.TriggerParcelPrimCountTainted(); 1357 EventManager.TriggerParcelPrimCountTainted();
1358 } 1358 }
1359 1359
1360 group.DeleteGroup(); 1360 group.DeleteGroup();
1361 group.DeleteParts(); 1361 group.DeleteParts();
1362 1362
1363 // In case anybody else retains a reference to this group, signal deletion by changing the name 1363 // In case anybody else retains a reference to this group, signal deletion by changing the name
@@ -1367,8 +1367,8 @@ namespace OpenSim.Region.Environment.Scenes
1367 // conditions where a user deletes an entity while it is being stored. Really, the update 1367 // conditions where a user deletes an entity while it is being stored. Really, the update
1368 // code needs a redesign. 1368 // code needs a redesign.
1369 group.Name = null; 1369 group.Name = null;
1370 } 1370 }
1371 1371
1372 /// <summary> 1372 /// <summary>
1373 /// Unlink the given object from the scene. Unlike delete, this just removes the record of the object - the 1373 /// Unlink the given object from the scene. Unlike delete, this just removes the record of the object - the
1374 /// object itself is not destroyed. 1374 /// object itself is not destroyed.
@@ -1376,14 +1376,14 @@ namespace OpenSim.Region.Environment.Scenes
1376 /// <param name="uuid"></param> 1376 /// <param name="uuid"></param>
1377 /// <returns>true if the object was in the scene, false if it was not</returns> 1377 /// <returns>true if the object was in the scene, false if it was not</returns>
1378 public bool UnlinkSceneObject(LLUUID uuid) 1378 public bool UnlinkSceneObject(LLUUID uuid)
1379 { 1379 {
1380 if (m_innerScene.DeleteSceneObject(uuid)) 1380 if (m_innerScene.DeleteSceneObject(uuid))
1381 { 1381 {
1382 m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID); 1382 m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID);
1383 1383
1384 return true; 1384 return true;
1385 } 1385 }
1386 1386
1387 return false; 1387 return false;
1388 } 1388 }
1389 1389
@@ -1406,7 +1406,7 @@ namespace OpenSim.Region.Environment.Scenes
1406 { 1406 {
1407 m_sceneXmlLoader.SavePrimsToXml2(fileName); 1407 m_sceneXmlLoader.SavePrimsToXml2(fileName);
1408 } 1408 }
1409 1409
1410 /// <summary> 1410 /// <summary>
1411 /// Load a prim archive into the scene. This loads both prims and their assets. 1411 /// Load a prim archive into the scene. This loads both prims and their assets.
1412 /// </summary> 1412 /// </summary>
@@ -1416,7 +1416,7 @@ namespace OpenSim.Region.Environment.Scenes
1416 IRegionArchiver archiver = RequestModuleInterface<IRegionArchiver>(); 1416 IRegionArchiver archiver = RequestModuleInterface<IRegionArchiver>();
1417 archiver.DearchiveRegion(filePath); 1417 archiver.DearchiveRegion(filePath);
1418 } 1418 }
1419 1419
1420 /// <summary> 1420 /// <summary>
1421 /// Save the prims in the scene to an archive. This saves both prims and their assets. 1421 /// Save the prims in the scene to an archive. This saves both prims and their assets.
1422 /// </summary> 1422 /// </summary>
@@ -1825,7 +1825,7 @@ namespace OpenSim.Region.Environment.Scenes
1825 1825
1826 protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child) 1826 protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child)
1827 { 1827 {
1828 1828
1829 AvatarAppearance appearance = null; 1829 AvatarAppearance appearance = null;
1830 GetAvatarAppearance(client, out appearance); 1830 GetAvatarAppearance(client, out appearance);
1831 1831