aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authormingchen2008-05-23 15:12:15 +0000
committermingchen2008-05-23 15:12:15 +0000
commitd04443b4fe0fb3993b53086d95be97a766b409f6 (patch)
treed6989220bdb1aad7e49546108f9624227c3f07f8 /OpenSim/Region/Environment/Scenes/Scene.cs
parenti've refactored the ChatModule into two modules: ChatModule and IRCBridgeModule. (diff)
downloadopensim-SC_OLD-d04443b4fe0fb3993b53086d95be97a766b409f6.zip
opensim-SC_OLD-d04443b4fe0fb3993b53086d95be97a766b409f6.tar.gz
opensim-SC_OLD-d04443b4fe0fb3993b53086d95be97a766b409f6.tar.bz2
opensim-SC_OLD-d04443b4fe0fb3993b53086d95be97a766b409f6.tar.xz
*Refactor of the LandManagementModule that allows OpenSim to run without it
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs35
1 files changed, 8 insertions, 27 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 774ddfc..fe8cada 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -819,7 +819,7 @@ namespace OpenSim.Region.Environment.Scenes
819 { 819 {
820 if (LandChannel.IsLandPrimCountTainted()) 820 if (LandChannel.IsLandPrimCountTainted())
821 { 821 {
822 LandChannel.PerformParcelPrimCountUpdate(); 822 EventManager.TriggerParcelPrimCountUpdate();
823 } 823 }
824 } 824 }
825 } 825 }
@@ -970,12 +970,12 @@ namespace OpenSim.Region.Environment.Scenes
970 if (dGridSettings["allow_forceful_banlines"] != "TRUE") 970 if (dGridSettings["allow_forceful_banlines"] != "TRUE")
971 { 971 {
972 m_log.Info("[GRID]: Grid is disabling forceful parcel banlists"); 972 m_log.Info("[GRID]: Grid is disabling forceful parcel banlists");
973 LandChannel.AllowedForcefulBans = false; 973 EventManager.TriggerSetAllowForcefulBan(false);
974 } 974 }
975 else 975 else
976 { 976 {
977 m_log.Info("[GRID]: Grid is allowing forceful parcel banlists"); 977 m_log.Info("[GRID]: Grid is allowing forceful parcel banlists");
978 LandChannel.AllowedForcefulBans = true; 978 EventManager.TriggerSetAllowForcefulBan(true);
979 } 979 }
980 } 980 }
981 } 981 }
@@ -1142,11 +1142,11 @@ namespace OpenSim.Region.Environment.Scenes
1142 { 1142 {
1143 if (landData.Count == 0) 1143 if (landData.Count == 0)
1144 { 1144 {
1145 LandChannel.NoLandDataFromStorage(); 1145 EventManager.TriggerNoticeNoLandDataFromStorage();
1146 } 1146 }
1147 else 1147 else
1148 { 1148 {
1149 LandChannel.IncomingLandObjectsFromStorage(landData); 1149 EventManager.TriggerIncomingLandDataFromStorage(landData);
1150 } 1150 }
1151 } 1151 }
1152 else 1152 else
@@ -1344,22 +1344,13 @@ namespace OpenSim.Region.Environment.Scenes
1344 { 1344 {
1345 if (Entities.ContainsKey(sceneObject.UUID)) 1345 if (Entities.ContainsKey(sceneObject.UUID))
1346 { 1346 {
1347 LandChannel.RemovePrimFromLandPrimCounts(sceneObject); 1347 EventManager.TriggerObjectBeingRemovedFromScene(sceneObject);
1348 Entities.Remove(sceneObject.UUID); 1348 Entities.Remove(sceneObject.UUID);
1349 LandChannel.SetPrimsTainted(); 1349 EventManager.TriggerParcelPrimCountTainted();
1350 m_innerScene.RemoveAPrimCount(); 1350 m_innerScene.RemoveAPrimCount();
1351 } 1351 }
1352 } 1352 }
1353 1353
1354 /// <summary>
1355 /// Called by a prim when it has been created/cloned, so that its events can be subscribed to
1356 /// </summary>
1357 /// <param name="prim"></param>
1358 public void AcknowledgeNewPrim(SceneObjectGroup prim)
1359 {
1360 prim.OnPrimCountTainted += LandChannel.SetPrimsTainted;
1361 }
1362
1363 public void LoadPrimsFromXml(string fileName, bool newIdsFlag, LLVector3 loadOffset) 1354 public void LoadPrimsFromXml(string fileName, bool newIdsFlag, LLVector3 loadOffset)
1364 { 1355 {
1365 m_sceneXmlLoader.LoadPrimsFromXml(fileName, newIdsFlag, loadOffset); 1356 m_sceneXmlLoader.LoadPrimsFromXml(fileName, newIdsFlag, loadOffset);
@@ -1589,15 +1580,6 @@ namespace OpenSim.Region.Environment.Scenes
1589 1580
1590 CreateAndAddScenePresence(client, child); 1581 CreateAndAddScenePresence(client, child);
1591 1582
1592 try
1593 {
1594 LandChannel.SendParcelOverlay(client);
1595 } //BUG: Mike - please fix this.
1596 catch (KeyNotFoundException)
1597 {
1598 m_log.Warn("[LAND]: Bug #2 triggered with NPC. LandModule needs a refactor to fix this.");
1599 }
1600
1601 CommsManager.UserProfileCacheService.AddNewUser(client.AgentId); 1583 CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
1602 } 1584 }
1603 } 1585 }
@@ -3174,8 +3156,7 @@ namespace OpenSim.Region.Environment.Scenes
3174 3156
3175 lock (Entities) 3157 lock (Entities)
3176 { 3158 {
3177 Entities.Remove(group.UUID); 3159 RemoveEntity(group);
3178 m_innerScene.RemoveAPrimCount();
3179 } 3160 }
3180 group.DeleteParts(); 3161 group.DeleteParts();
3181 3162