diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 684 |
1 files changed, 522 insertions, 162 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 1f5cddd..9559cc4 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -118,6 +118,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
118 | // TODO: need to figure out how allow client agents but deny | 118 | // TODO: need to figure out how allow client agents but deny |
119 | // root agents when ACL denies access to root agent | 119 | // root agents when ACL denies access to root agent |
120 | public bool m_strictAccessControl = true; | 120 | public bool m_strictAccessControl = true; |
121 | public bool m_seeIntoBannedRegion = false; | ||
121 | public int MaxUndoCount = 5; | 122 | public int MaxUndoCount = 5; |
122 | // Using this for RegionReady module to prevent LoginsDisabled from changing under our feet; | 123 | // Using this for RegionReady module to prevent LoginsDisabled from changing under our feet; |
123 | public bool LoginLock = false; | 124 | public bool LoginLock = false; |
@@ -133,12 +134,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
133 | 134 | ||
134 | protected int m_splitRegionID; | 135 | protected int m_splitRegionID; |
135 | protected Timer m_restartWaitTimer = new Timer(); | 136 | protected Timer m_restartWaitTimer = new Timer(); |
137 | protected Timer m_timerWatchdog = new Timer(); | ||
136 | protected List<RegionInfo> m_regionRestartNotifyList = new List<RegionInfo>(); | 138 | protected List<RegionInfo> m_regionRestartNotifyList = new List<RegionInfo>(); |
137 | protected List<RegionInfo> m_neighbours = new List<RegionInfo>(); | 139 | protected List<RegionInfo> m_neighbours = new List<RegionInfo>(); |
138 | protected string m_simulatorVersion = "OpenSimulator Server"; | 140 | protected string m_simulatorVersion = "OpenSimulator Server"; |
139 | protected ModuleLoader m_moduleLoader; | 141 | protected ModuleLoader m_moduleLoader; |
140 | protected AgentCircuitManager m_authenticateHandler; | 142 | protected AgentCircuitManager m_authenticateHandler; |
141 | protected SceneCommunicationService m_sceneGridService; | 143 | protected SceneCommunicationService m_sceneGridService; |
144 | protected ISnmpModule m_snmpService = null; | ||
142 | 145 | ||
143 | protected ISimulationDataService m_SimulationDataService; | 146 | protected ISimulationDataService m_SimulationDataService; |
144 | protected IEstateDataService m_EstateDataService; | 147 | protected IEstateDataService m_EstateDataService; |
@@ -201,7 +204,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
201 | private int m_update_events = 1; | 204 | private int m_update_events = 1; |
202 | private int m_update_backup = 200; | 205 | private int m_update_backup = 200; |
203 | private int m_update_terrain = 50; | 206 | private int m_update_terrain = 50; |
204 | // private int m_update_land = 1; | 207 | private int m_update_land = 10; |
205 | private int m_update_coarse_locations = 50; | 208 | private int m_update_coarse_locations = 50; |
206 | 209 | ||
207 | private int agentMS; | 210 | private int agentMS; |
@@ -220,6 +223,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
220 | /// </summary> | 223 | /// </summary> |
221 | private int m_lastFrameTick; | 224 | private int m_lastFrameTick; |
222 | 225 | ||
226 | public bool CombineRegions = false; | ||
223 | /// <summary> | 227 | /// <summary> |
224 | /// Tick at which the last maintenance run occurred. | 228 | /// Tick at which the last maintenance run occurred. |
225 | /// </summary> | 229 | /// </summary> |
@@ -250,6 +254,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
250 | /// </summary> | 254 | /// </summary> |
251 | private int m_LastLogin; | 255 | private int m_LastLogin; |
252 | 256 | ||
257 | private int m_lastIncoming; | ||
258 | private int m_lastOutgoing; | ||
259 | private int m_hbRestarts = 0; | ||
260 | |||
261 | |||
253 | /// <summary> | 262 | /// <summary> |
254 | /// Thread that runs the scene loop. | 263 | /// Thread that runs the scene loop. |
255 | /// </summary> | 264 | /// </summary> |
@@ -265,7 +274,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
265 | private volatile bool m_shuttingDown; | 274 | private volatile bool m_shuttingDown; |
266 | 275 | ||
267 | // private int m_lastUpdate; | 276 | // private int m_lastUpdate; |
268 | // private bool m_firstHeartbeat = true; | 277 | private bool m_firstHeartbeat = true; |
269 | 278 | ||
270 | private UpdatePrioritizationSchemes m_priorityScheme = UpdatePrioritizationSchemes.Time; | 279 | private UpdatePrioritizationSchemes m_priorityScheme = UpdatePrioritizationSchemes.Time; |
271 | private bool m_reprioritizationEnabled = true; | 280 | private bool m_reprioritizationEnabled = true; |
@@ -310,6 +319,19 @@ namespace OpenSim.Region.Framework.Scenes | |||
310 | get { return m_sceneGridService; } | 319 | get { return m_sceneGridService; } |
311 | } | 320 | } |
312 | 321 | ||
322 | public ISnmpModule SnmpService | ||
323 | { | ||
324 | get | ||
325 | { | ||
326 | if (m_snmpService == null) | ||
327 | { | ||
328 | m_snmpService = RequestModuleInterface<ISnmpModule>(); | ||
329 | } | ||
330 | |||
331 | return m_snmpService; | ||
332 | } | ||
333 | } | ||
334 | |||
313 | public ISimulationDataService SimulationDataService | 335 | public ISimulationDataService SimulationDataService |
314 | { | 336 | { |
315 | get | 337 | get |
@@ -592,6 +614,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
592 | m_EstateDataService = estateDataService; | 614 | m_EstateDataService = estateDataService; |
593 | m_regionHandle = m_regInfo.RegionHandle; | 615 | m_regionHandle = m_regInfo.RegionHandle; |
594 | m_regionName = m_regInfo.RegionName; | 616 | m_regionName = m_regInfo.RegionName; |
617 | m_lastIncoming = 0; | ||
618 | m_lastOutgoing = 0; | ||
595 | 619 | ||
596 | m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this); | 620 | m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this); |
597 | m_asyncSceneObjectDeleter.Enabled = true; | 621 | m_asyncSceneObjectDeleter.Enabled = true; |
@@ -676,98 +700,107 @@ namespace OpenSim.Region.Framework.Scenes | |||
676 | 700 | ||
677 | // Region config overrides global config | 701 | // Region config overrides global config |
678 | // | 702 | // |
679 | if (m_config.Configs["Startup"] != null) | 703 | try |
680 | { | 704 | { |
681 | IConfig startupConfig = m_config.Configs["Startup"]; | 705 | if (m_config.Configs["Startup"] != null) |
682 | |||
683 | m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance",m_defaultDrawDistance); | ||
684 | m_useBackup = startupConfig.GetBoolean("UseSceneBackup", m_useBackup); | ||
685 | if (!m_useBackup) | ||
686 | m_log.InfoFormat("[SCENE]: Backup has been disabled for {0}", RegionInfo.RegionName); | ||
687 | |||
688 | //Animation states | ||
689 | m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); | ||
690 | |||
691 | PhysicalPrims = startupConfig.GetBoolean("physical_prim", true); | ||
692 | CollidablePrims = startupConfig.GetBoolean("collidable_prim", true); | ||
693 | |||
694 | m_maxNonphys = startupConfig.GetFloat("NonphysicalPrimMax", m_maxNonphys); | ||
695 | if (RegionInfo.NonphysPrimMax > 0) | ||
696 | { | 706 | { |
697 | m_maxNonphys = RegionInfo.NonphysPrimMax; | 707 | IConfig startupConfig = m_config.Configs["Startup"]; |
698 | } | ||
699 | 708 | ||
700 | m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", m_maxPhys); | 709 | m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance",m_defaultDrawDistance); |
710 | m_useBackup = startupConfig.GetBoolean("UseSceneBackup", m_useBackup); | ||
711 | if (!m_useBackup) | ||
712 | m_log.InfoFormat("[SCENE]: Backup has been disabled for {0}", RegionInfo.RegionName); | ||
713 | |||
714 | //Animation states | ||
715 | m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); | ||
701 | 716 | ||
702 | if (RegionInfo.PhysPrimMax > 0) | 717 | PhysicalPrims = startupConfig.GetBoolean("physical_prim", true); |
703 | { | 718 | CollidablePrims = startupConfig.GetBoolean("collidable_prim", true); |
704 | m_maxPhys = RegionInfo.PhysPrimMax; | ||
705 | } | ||
706 | 719 | ||
707 | // Here, if clamping is requested in either global or | 720 | m_maxNonphys = startupConfig.GetFloat("NonphysicalPrimMax", m_maxNonphys); |
708 | // local config, it will be used | 721 | if (RegionInfo.NonphysPrimMax > 0) |
709 | // | 722 | { |
710 | m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", m_clampPrimSize); | 723 | m_maxNonphys = RegionInfo.NonphysPrimMax; |
711 | if (RegionInfo.ClampPrimSize) | 724 | } |
712 | { | ||
713 | m_clampPrimSize = true; | ||
714 | } | ||
715 | 725 | ||
716 | m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries); | 726 | m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", m_maxPhys); |
717 | m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings); | ||
718 | m_dontPersistBefore = | ||
719 | startupConfig.GetLong("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE); | ||
720 | m_dontPersistBefore *= 10000000; | ||
721 | m_persistAfter = | ||
722 | startupConfig.GetLong("MaximumTimeBeforePersistenceConsidered", DEFAULT_MAX_TIME_FOR_PERSISTENCE); | ||
723 | m_persistAfter *= 10000000; | ||
724 | 727 | ||
725 | m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine"); | 728 | if (RegionInfo.PhysPrimMax > 0) |
729 | { | ||
730 | m_maxPhys = RegionInfo.PhysPrimMax; | ||
731 | } | ||
726 | 732 | ||
727 | IConfig packetConfig = m_config.Configs["PacketPool"]; | 733 | // Here, if clamping is requested in either global or |
728 | if (packetConfig != null) | 734 | // local config, it will be used |
729 | { | 735 | // |
730 | PacketPool.Instance.RecyclePackets = packetConfig.GetBoolean("RecyclePackets", true); | 736 | m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", m_clampPrimSize); |
731 | PacketPool.Instance.RecycleDataBlocks = packetConfig.GetBoolean("RecycleDataBlocks", true); | 737 | if (RegionInfo.ClampPrimSize) |
732 | } | 738 | { |
739 | m_clampPrimSize = true; | ||
740 | } | ||
733 | 741 | ||
734 | m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl); | 742 | m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries); |
743 | m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings); | ||
744 | m_dontPersistBefore = | ||
745 | startupConfig.GetLong("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE); | ||
746 | m_dontPersistBefore *= 10000000; | ||
747 | m_persistAfter = | ||
748 | startupConfig.GetLong("MaximumTimeBeforePersistenceConsidered", DEFAULT_MAX_TIME_FOR_PERSISTENCE); | ||
749 | m_persistAfter *= 10000000; | ||
735 | 750 | ||
736 | m_generateMaptiles = startupConfig.GetBoolean("GenerateMaptiles", true); | 751 | m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine"); |
737 | if (m_generateMaptiles) | 752 | m_log.InfoFormat("[SCENE]: Default script engine {0}", m_defaultScriptEngine); |
738 | { | 753 | |
739 | int maptileRefresh = startupConfig.GetInt("MaptileRefresh", 0); | 754 | IConfig packetConfig = m_config.Configs["PacketPool"]; |
740 | if (maptileRefresh != 0) | 755 | if (packetConfig != null) |
741 | { | 756 | { |
742 | m_mapGenerationTimer.Interval = maptileRefresh * 1000; | 757 | PacketPool.Instance.RecyclePackets = packetConfig.GetBoolean("RecyclePackets", true); |
743 | m_mapGenerationTimer.Elapsed += RegenerateMaptileAndReregister; | 758 | PacketPool.Instance.RecycleDataBlocks = packetConfig.GetBoolean("RecycleDataBlocks", true); |
744 | m_mapGenerationTimer.AutoReset = true; | ||
745 | m_mapGenerationTimer.Start(); | ||
746 | } | 759 | } |
747 | } | ||
748 | else | ||
749 | { | ||
750 | string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString()); | ||
751 | UUID tileID; | ||
752 | 760 | ||
753 | if (UUID.TryParse(tile, out tileID)) | 761 | m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl); |
762 | m_seeIntoBannedRegion = startupConfig.GetBoolean("SeeIntoBannedRegion", m_seeIntoBannedRegion); | ||
763 | CombineRegions = startupConfig.GetBoolean("CombineContiguousRegions", false); | ||
764 | |||
765 | m_generateMaptiles = startupConfig.GetBoolean("GenerateMaptiles", true); | ||
766 | if (m_generateMaptiles) | ||
754 | { | 767 | { |
755 | RegionInfo.RegionSettings.TerrainImageID = tileID; | 768 | int maptileRefresh = startupConfig.GetInt("MaptileRefresh", 0); |
769 | if (maptileRefresh != 0) | ||
770 | { | ||
771 | m_mapGenerationTimer.Interval = maptileRefresh * 1000; | ||
772 | m_mapGenerationTimer.Elapsed += RegenerateMaptileAndReregister; | ||
773 | m_mapGenerationTimer.AutoReset = true; | ||
774 | m_mapGenerationTimer.Start(); | ||
775 | } | ||
756 | } | 776 | } |
757 | } | 777 | else |
778 | { | ||
779 | string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString()); | ||
780 | UUID tileID; | ||
758 | 781 | ||
759 | MinFrameTime = startupConfig.GetFloat( "MinFrameTime", MinFrameTime); | 782 | if (UUID.TryParse(tile, out tileID)) |
760 | m_update_backup = startupConfig.GetInt( "UpdateStorageEveryNFrames", m_update_backup); | 783 | { |
761 | m_update_coarse_locations = startupConfig.GetInt( "UpdateCoarseLocationsEveryNFrames", m_update_coarse_locations); | 784 | RegionInfo.RegionSettings.TerrainImageID = tileID; |
762 | m_update_entitymovement = startupConfig.GetInt( "UpdateEntityMovementEveryNFrames", m_update_entitymovement); | 785 | } |
763 | m_update_events = startupConfig.GetInt( "UpdateEventsEveryNFrames", m_update_events); | 786 | } |
764 | m_update_objects = startupConfig.GetInt( "UpdateObjectsEveryNFrames", m_update_objects); | ||
765 | m_update_physics = startupConfig.GetInt( "UpdatePhysicsEveryNFrames", m_update_physics); | ||
766 | m_update_presences = startupConfig.GetInt( "UpdateAgentsEveryNFrames", m_update_presences); | ||
767 | m_update_terrain = startupConfig.GetInt( "UpdateTerrainEveryNFrames", m_update_terrain); | ||
768 | m_update_temp_cleaning = startupConfig.GetInt( "UpdateTempCleaningEveryNFrames", m_update_temp_cleaning); | ||
769 | 787 | ||
770 | SendPeriodicAppearanceUpdates = startupConfig.GetBoolean("SendPeriodicAppearanceUpdates", SendPeriodicAppearanceUpdates); | 788 | MinFrameTime = startupConfig.GetFloat( "MinFrameTime", MinFrameTime); |
789 | m_update_backup = startupConfig.GetInt( "UpdateStorageEveryNFrames", m_update_backup); | ||
790 | m_update_coarse_locations = startupConfig.GetInt( "UpdateCoarseLocationsEveryNFrames", m_update_coarse_locations); | ||
791 | m_update_entitymovement = startupConfig.GetInt( "UpdateEntityMovementEveryNFrames", m_update_entitymovement); | ||
792 | m_update_events = startupConfig.GetInt( "UpdateEventsEveryNFrames", m_update_events); | ||
793 | m_update_objects = startupConfig.GetInt( "UpdateObjectsEveryNFrames", m_update_objects); | ||
794 | m_update_physics = startupConfig.GetInt( "UpdatePhysicsEveryNFrames", m_update_physics); | ||
795 | m_update_presences = startupConfig.GetInt( "UpdateAgentsEveryNFrames", m_update_presences); | ||
796 | m_update_terrain = startupConfig.GetInt( "UpdateTerrainEveryNFrames", m_update_terrain); | ||
797 | m_update_temp_cleaning = startupConfig.GetInt( "UpdateTempCleaningEveryNFrames", m_update_temp_cleaning); | ||
798 | SendPeriodicAppearanceUpdates = startupConfig.GetBoolean("SendPeriodicAppearanceUpdates", SendPeriodicAppearanceUpdates); | ||
799 | } | ||
800 | } | ||
801 | catch (Exception e) | ||
802 | { | ||
803 | m_log.Error("[SCENE]: Failed to load StartupConfig: " + e.ToString()); | ||
771 | } | 804 | } |
772 | 805 | ||
773 | #endregion Region Config | 806 | #endregion Region Config |
@@ -1198,7 +1231,22 @@ namespace OpenSim.Region.Framework.Scenes | |||
1198 | //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat); | 1231 | //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat); |
1199 | if (m_heartbeatThread != null) | 1232 | if (m_heartbeatThread != null) |
1200 | { | 1233 | { |
1234 | m_hbRestarts++; | ||
1235 | if(m_hbRestarts > 10) | ||
1236 | Environment.Exit(1); | ||
1237 | m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName); | ||
1238 | |||
1239 | //int pid = System.Diagnostics.Process.GetCurrentProcess().Id; | ||
1240 | //System.Diagnostics.Process proc = new System.Diagnostics.Process(); | ||
1241 | //proc.EnableRaisingEvents=false; | ||
1242 | //proc.StartInfo.FileName = "/bin/kill"; | ||
1243 | //proc.StartInfo.Arguments = "-QUIT " + pid.ToString(); | ||
1244 | //proc.Start(); | ||
1245 | //proc.WaitForExit(); | ||
1246 | //Thread.Sleep(1000); | ||
1247 | //Environment.Exit(1); | ||
1201 | m_heartbeatThread.Abort(); | 1248 | m_heartbeatThread.Abort(); |
1249 | Watchdog.AbortThread(m_heartbeatThread.ManagedThreadId); | ||
1202 | m_heartbeatThread = null; | 1250 | m_heartbeatThread = null; |
1203 | } | 1251 | } |
1204 | // m_lastUpdate = Util.EnvironmentTickCount(); | 1252 | // m_lastUpdate = Util.EnvironmentTickCount(); |
@@ -1511,6 +1559,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1511 | maintc = Util.EnvironmentTickCountSubtract(m_lastFrameTick, maintc); | 1559 | maintc = Util.EnvironmentTickCountSubtract(m_lastFrameTick, maintc); |
1512 | maintc = (int)(MinFrameTime * 1000) - maintc; | 1560 | maintc = (int)(MinFrameTime * 1000) - maintc; |
1513 | 1561 | ||
1562 | m_firstHeartbeat = false; | ||
1563 | |||
1514 | if (maintc > 0) | 1564 | if (maintc > 0) |
1515 | Thread.Sleep(maintc); | 1565 | Thread.Sleep(maintc); |
1516 | 1566 | ||
@@ -1540,9 +1590,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1540 | 1590 | ||
1541 | private void CheckAtTargets() | 1591 | private void CheckAtTargets() |
1542 | { | 1592 | { |
1543 | Dictionary<UUID, SceneObjectGroup>.ValueCollection objs; | 1593 | List<SceneObjectGroup> objs = new List<SceneObjectGroup>(); |
1544 | lock (m_groupsWithTargets) | 1594 | lock (m_groupsWithTargets) |
1545 | objs = m_groupsWithTargets.Values; | 1595 | objs = new List<SceneObjectGroup>(m_groupsWithTargets.Values); |
1546 | 1596 | ||
1547 | foreach (SceneObjectGroup entry in objs) | 1597 | foreach (SceneObjectGroup entry in objs) |
1548 | entry.checkAtTargets(); | 1598 | entry.checkAtTargets(); |
@@ -1623,7 +1673,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1623 | msg.fromAgentName = "Server"; | 1673 | msg.fromAgentName = "Server"; |
1624 | msg.dialog = (byte)19; // Object msg | 1674 | msg.dialog = (byte)19; // Object msg |
1625 | msg.fromGroup = false; | 1675 | msg.fromGroup = false; |
1626 | msg.offline = (byte)0; | 1676 | msg.offline = (byte)1; |
1627 | msg.ParentEstateID = RegionInfo.EstateSettings.ParentEstateID; | 1677 | msg.ParentEstateID = RegionInfo.EstateSettings.ParentEstateID; |
1628 | msg.Position = Vector3.Zero; | 1678 | msg.Position = Vector3.Zero; |
1629 | msg.RegionID = RegionInfo.RegionID.Guid; | 1679 | msg.RegionID = RegionInfo.RegionID.Guid; |
@@ -1861,14 +1911,24 @@ namespace OpenSim.Region.Framework.Scenes | |||
1861 | /// <returns></returns> | 1911 | /// <returns></returns> |
1862 | public Vector3 GetNewRezLocation(Vector3 RayStart, Vector3 RayEnd, UUID RayTargetID, Quaternion rot, byte bypassRayCast, byte RayEndIsIntersection, bool frontFacesOnly, Vector3 scale, bool FaceCenter) | 1912 | public Vector3 GetNewRezLocation(Vector3 RayStart, Vector3 RayEnd, UUID RayTargetID, Quaternion rot, byte bypassRayCast, byte RayEndIsIntersection, bool frontFacesOnly, Vector3 scale, bool FaceCenter) |
1863 | { | 1913 | { |
1914 | |||
1915 | float wheight = (float)RegionInfo.RegionSettings.WaterHeight; | ||
1916 | Vector3 wpos = Vector3.Zero; | ||
1917 | // Check for water surface intersection from above | ||
1918 | if ( (RayStart.Z > wheight) && (RayEnd.Z < wheight) ) | ||
1919 | { | ||
1920 | float ratio = (RayStart.Z - wheight) / (RayStart.Z - RayEnd.Z); | ||
1921 | wpos.X = RayStart.X - (ratio * (RayStart.X - RayEnd.X)); | ||
1922 | wpos.Y = RayStart.Y - (ratio * (RayStart.Y - RayEnd.Y)); | ||
1923 | wpos.Z = wheight; | ||
1924 | } | ||
1925 | |||
1864 | Vector3 pos = Vector3.Zero; | 1926 | Vector3 pos = Vector3.Zero; |
1865 | if (RayEndIsIntersection == (byte)1) | 1927 | if (RayEndIsIntersection == (byte)1) |
1866 | { | 1928 | { |
1867 | pos = RayEnd; | 1929 | pos = RayEnd; |
1868 | return pos; | ||
1869 | } | 1930 | } |
1870 | 1931 | else if (RayTargetID != UUID.Zero) | |
1871 | if (RayTargetID != UUID.Zero) | ||
1872 | { | 1932 | { |
1873 | SceneObjectPart target = GetSceneObjectPart(RayTargetID); | 1933 | SceneObjectPart target = GetSceneObjectPart(RayTargetID); |
1874 | 1934 | ||
@@ -1890,7 +1950,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1890 | EntityIntersection ei = target.TestIntersectionOBB(NewRay, Quaternion.Identity, frontFacesOnly, FaceCenter); | 1950 | EntityIntersection ei = target.TestIntersectionOBB(NewRay, Quaternion.Identity, frontFacesOnly, FaceCenter); |
1891 | 1951 | ||
1892 | // Un-comment out the following line to Get Raytrace results printed to the console. | 1952 | // Un-comment out the following line to Get Raytrace results printed to the console. |
1893 | // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString()); | 1953 | // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString()); |
1894 | float ScaleOffset = 0.5f; | 1954 | float ScaleOffset = 0.5f; |
1895 | 1955 | ||
1896 | // If we hit something | 1956 | // If we hit something |
@@ -1913,13 +1973,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1913 | //pos.Z -= 0.25F; | 1973 | //pos.Z -= 0.25F; |
1914 | 1974 | ||
1915 | } | 1975 | } |
1916 | |||
1917 | return pos; | ||
1918 | } | 1976 | } |
1919 | else | 1977 | else |
1920 | { | 1978 | { |
1921 | // We don't have a target here, so we're going to raytrace all the objects in the scene. | 1979 | // We don't have a target here, so we're going to raytrace all the objects in the scene. |
1922 | |||
1923 | EntityIntersection ei = m_sceneGraph.GetClosestIntersectingPrim(new Ray(AXOrigin, AXdirection), true, false); | 1980 | EntityIntersection ei = m_sceneGraph.GetClosestIntersectingPrim(new Ray(AXOrigin, AXdirection), true, false); |
1924 | 1981 | ||
1925 | // Un-comment the following line to print the raytrace results to the console. | 1982 | // Un-comment the following line to print the raytrace results to the console. |
@@ -1928,13 +1985,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1928 | if (ei.HitTF) | 1985 | if (ei.HitTF) |
1929 | { | 1986 | { |
1930 | pos = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z); | 1987 | pos = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z); |
1931 | } else | 1988 | } |
1989 | else | ||
1932 | { | 1990 | { |
1933 | // fall back to our stupid functionality | 1991 | // fall back to our stupid functionality |
1934 | pos = RayEnd; | 1992 | pos = RayEnd; |
1935 | } | 1993 | } |
1936 | |||
1937 | return pos; | ||
1938 | } | 1994 | } |
1939 | } | 1995 | } |
1940 | else | 1996 | else |
@@ -1945,8 +2001,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1945 | //increase height so its above the ground. | 2001 | //increase height so its above the ground. |
1946 | //should be getting the normal of the ground at the rez point and using that? | 2002 | //should be getting the normal of the ground at the rez point and using that? |
1947 | pos.Z += scale.Z / 2f; | 2003 | pos.Z += scale.Z / 2f; |
1948 | return pos; | 2004 | // return pos; |
1949 | } | 2005 | } |
2006 | |||
2007 | // check against posible water intercept | ||
2008 | if (wpos.Z > pos.Z) pos = wpos; | ||
2009 | return pos; | ||
1950 | } | 2010 | } |
1951 | 2011 | ||
1952 | 2012 | ||
@@ -2030,7 +2090,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2030 | public bool AddRestoredSceneObject( | 2090 | public bool AddRestoredSceneObject( |
2031 | SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates) | 2091 | SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates) |
2032 | { | 2092 | { |
2033 | return m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates); | 2093 | bool result = m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates); |
2094 | if (result) | ||
2095 | sceneObject.IsDeleted = false; | ||
2096 | return result; | ||
2034 | } | 2097 | } |
2035 | 2098 | ||
2036 | /// <summary> | 2099 | /// <summary> |
@@ -2122,6 +2185,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
2122 | /// </summary> | 2185 | /// </summary> |
2123 | public void DeleteAllSceneObjects() | 2186 | public void DeleteAllSceneObjects() |
2124 | { | 2187 | { |
2188 | DeleteAllSceneObjects(false); | ||
2189 | } | ||
2190 | |||
2191 | /// <summary> | ||
2192 | /// Delete every object from the scene. This does not include attachments worn by avatars. | ||
2193 | /// </summary> | ||
2194 | public void DeleteAllSceneObjects(bool exceptNoCopy) | ||
2195 | { | ||
2196 | List<SceneObjectGroup> toReturn = new List<SceneObjectGroup>(); | ||
2125 | lock (Entities) | 2197 | lock (Entities) |
2126 | { | 2198 | { |
2127 | EntityBase[] entities = Entities.GetEntities(); | 2199 | EntityBase[] entities = Entities.GetEntities(); |
@@ -2130,11 +2202,24 @@ namespace OpenSim.Region.Framework.Scenes | |||
2130 | if (e is SceneObjectGroup) | 2202 | if (e is SceneObjectGroup) |
2131 | { | 2203 | { |
2132 | SceneObjectGroup sog = (SceneObjectGroup)e; | 2204 | SceneObjectGroup sog = (SceneObjectGroup)e; |
2133 | if (!sog.IsAttachment) | 2205 | if (sog != null && !sog.IsAttachment) |
2134 | DeleteSceneObject((SceneObjectGroup)e, false); | 2206 | { |
2207 | if (!exceptNoCopy || ((sog.GetEffectivePermissions() & (uint)PermissionMask.Copy) != 0)) | ||
2208 | { | ||
2209 | DeleteSceneObject((SceneObjectGroup)e, false); | ||
2210 | } | ||
2211 | else | ||
2212 | { | ||
2213 | toReturn.Add((SceneObjectGroup)e); | ||
2214 | } | ||
2215 | } | ||
2135 | } | 2216 | } |
2136 | } | 2217 | } |
2137 | } | 2218 | } |
2219 | if (toReturn.Count > 0) | ||
2220 | { | ||
2221 | returnObjects(toReturn.ToArray(), UUID.Zero); | ||
2222 | } | ||
2138 | } | 2223 | } |
2139 | 2224 | ||
2140 | /// <summary> | 2225 | /// <summary> |
@@ -2175,6 +2260,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2175 | } | 2260 | } |
2176 | 2261 | ||
2177 | group.DeleteGroupFromScene(silent); | 2262 | group.DeleteGroupFromScene(silent); |
2263 | if (!silent) | ||
2264 | SendKillObject(new List<uint>() { group.LocalId }); | ||
2178 | 2265 | ||
2179 | // m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID); | 2266 | // m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID); |
2180 | } | 2267 | } |
@@ -2464,6 +2551,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2464 | 2551 | ||
2465 | if (newPosition != Vector3.Zero) | 2552 | if (newPosition != Vector3.Zero) |
2466 | newObject.RootPart.GroupPosition = newPosition; | 2553 | newObject.RootPart.GroupPosition = newPosition; |
2554 | if (newObject.RootPart.KeyframeMotion != null) | ||
2555 | newObject.RootPart.KeyframeMotion.UpdateSceneObject(newObject); | ||
2467 | 2556 | ||
2468 | if (!AddSceneObject(newObject)) | 2557 | if (!AddSceneObject(newObject)) |
2469 | { | 2558 | { |
@@ -2532,10 +2621,17 @@ namespace OpenSim.Region.Framework.Scenes | |||
2532 | /// <returns>True if the SceneObjectGroup was added, False if it was not</returns> | 2621 | /// <returns>True if the SceneObjectGroup was added, False if it was not</returns> |
2533 | public bool AddSceneObject(SceneObjectGroup sceneObject) | 2622 | public bool AddSceneObject(SceneObjectGroup sceneObject) |
2534 | { | 2623 | { |
2624 | if (sceneObject.OwnerID == UUID.Zero) | ||
2625 | { | ||
2626 | m_log.ErrorFormat("[SCENE]: Owner ID for {0} was zero", sceneObject.UUID); | ||
2627 | return false; | ||
2628 | } | ||
2629 | |||
2535 | // If the user is banned, we won't let any of their objects | 2630 | // If the user is banned, we won't let any of their objects |
2536 | // enter. Period. | 2631 | // enter. Period. |
2537 | // | 2632 | // |
2538 | if (m_regInfo.EstateSettings.IsBanned(sceneObject.OwnerID)) | 2633 | int flags = GetUserFlags(sceneObject.OwnerID); |
2634 | if (m_regInfo.EstateSettings.IsBanned(sceneObject.OwnerID, flags)) | ||
2539 | { | 2635 | { |
2540 | m_log.InfoFormat("[INTERREGION]: Denied prim crossing for banned avatar {0}", sceneObject.OwnerID); | 2636 | m_log.InfoFormat("[INTERREGION]: Denied prim crossing for banned avatar {0}", sceneObject.OwnerID); |
2541 | 2637 | ||
@@ -2581,12 +2677,23 @@ namespace OpenSim.Region.Framework.Scenes | |||
2581 | } | 2677 | } |
2582 | else | 2678 | else |
2583 | { | 2679 | { |
2680 | m_log.DebugFormat("[SCENE]: Attachment {0} arrived and scene presence was not found, setting to temp", sceneObject.UUID); | ||
2584 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); | 2681 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); |
2585 | RootPrim.AddFlag(PrimFlags.TemporaryOnRez); | 2682 | RootPrim.AddFlag(PrimFlags.TemporaryOnRez); |
2586 | } | 2683 | } |
2684 | if (sceneObject.OwnerID == UUID.Zero) | ||
2685 | { | ||
2686 | m_log.ErrorFormat("[SCENE]: Owner ID for {0} was zero after attachment processing. BUG!", sceneObject.UUID); | ||
2687 | return false; | ||
2688 | } | ||
2587 | } | 2689 | } |
2588 | else | 2690 | else |
2589 | { | 2691 | { |
2692 | if (sceneObject.OwnerID == UUID.Zero) | ||
2693 | { | ||
2694 | m_log.ErrorFormat("[SCENE]: Owner ID for non-attachment {0} was zero", sceneObject.UUID); | ||
2695 | return false; | ||
2696 | } | ||
2590 | AddRestoredSceneObject(sceneObject, true, false); | 2697 | AddRestoredSceneObject(sceneObject, true, false); |
2591 | 2698 | ||
2592 | if (!Permissions.CanObjectEntry(sceneObject.UUID, | 2699 | if (!Permissions.CanObjectEntry(sceneObject.UUID, |
@@ -2615,6 +2722,24 @@ namespace OpenSim.Region.Framework.Scenes | |||
2615 | return 2; // StateSource.PrimCrossing | 2722 | return 2; // StateSource.PrimCrossing |
2616 | } | 2723 | } |
2617 | 2724 | ||
2725 | public int GetUserFlags(UUID user) | ||
2726 | { | ||
2727 | //Unfortunately the SP approach means that the value is cached until region is restarted | ||
2728 | /* | ||
2729 | ScenePresence sp; | ||
2730 | if (TryGetScenePresence(user, out sp)) | ||
2731 | { | ||
2732 | return sp.UserFlags; | ||
2733 | } | ||
2734 | else | ||
2735 | { | ||
2736 | */ | ||
2737 | UserAccount uac = UserAccountService.GetUserAccount(RegionInfo.ScopeID, user); | ||
2738 | if (uac == null) | ||
2739 | return 0; | ||
2740 | return uac.UserFlags; | ||
2741 | //} | ||
2742 | } | ||
2618 | #endregion | 2743 | #endregion |
2619 | 2744 | ||
2620 | #region Add/Remove Avatar Methods | 2745 | #region Add/Remove Avatar Methods |
@@ -2628,7 +2753,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2628 | = (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0 | 2753 | = (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0 |
2629 | || (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0; | 2754 | || (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0; |
2630 | 2755 | ||
2631 | // CheckHeartbeat(); | 2756 | CheckHeartbeat(); |
2632 | 2757 | ||
2633 | ScenePresence sp = GetScenePresence(client.AgentId); | 2758 | ScenePresence sp = GetScenePresence(client.AgentId); |
2634 | 2759 | ||
@@ -2692,7 +2817,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
2692 | 2817 | ||
2693 | EventManager.TriggerOnNewClient(client); | 2818 | EventManager.TriggerOnNewClient(client); |
2694 | if (vialogin) | 2819 | if (vialogin) |
2820 | { | ||
2695 | EventManager.TriggerOnClientLogin(client); | 2821 | EventManager.TriggerOnClientLogin(client); |
2822 | // Send initial parcel data | ||
2823 | Vector3 pos = sp.AbsolutePosition; | ||
2824 | ILandObject land = LandChannel.GetLandObject(pos.X, pos.Y); | ||
2825 | land.SendLandUpdateToClient(client); | ||
2826 | } | ||
2696 | 2827 | ||
2697 | return sp; | 2828 | return sp; |
2698 | } | 2829 | } |
@@ -2782,19 +2913,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
2782 | // and the scene presence and the client, if they exist | 2913 | // and the scene presence and the client, if they exist |
2783 | try | 2914 | try |
2784 | { | 2915 | { |
2785 | // We need to wait for the client to make UDP contact first. | 2916 | ScenePresence sp = GetScenePresence(agentID); |
2786 | // It's the UDP contact that creates the scene presence | 2917 | PresenceService.LogoutAgent(sp.ControllingClient.SessionId); |
2787 | ScenePresence sp = WaitGetScenePresence(agentID); | 2918 | |
2788 | if (sp != null) | 2919 | if (sp != null) |
2789 | { | ||
2790 | PresenceService.LogoutAgent(sp.ControllingClient.SessionId); | ||
2791 | |||
2792 | sp.ControllingClient.Close(); | 2920 | sp.ControllingClient.Close(); |
2793 | } | 2921 | |
2794 | else | ||
2795 | { | ||
2796 | m_log.WarnFormat("[SCENE]: Could not find scene presence for {0}", agentID); | ||
2797 | } | ||
2798 | // BANG! SLASH! | 2922 | // BANG! SLASH! |
2799 | m_authenticateHandler.RemoveCircuit(agentID); | 2923 | m_authenticateHandler.RemoveCircuit(agentID); |
2800 | 2924 | ||
@@ -2839,6 +2963,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2839 | client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimGroupPosition; | 2963 | client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimGroupPosition; |
2840 | client.OnUpdatePrimSinglePosition += m_sceneGraph.UpdatePrimSinglePosition; | 2964 | client.OnUpdatePrimSinglePosition += m_sceneGraph.UpdatePrimSinglePosition; |
2841 | 2965 | ||
2966 | client.onClientChangeObject += m_sceneGraph.ClientChangeObject; | ||
2967 | |||
2842 | client.OnUpdatePrimGroupRotation += m_sceneGraph.UpdatePrimGroupRotation; | 2968 | client.OnUpdatePrimGroupRotation += m_sceneGraph.UpdatePrimGroupRotation; |
2843 | client.OnUpdatePrimGroupMouseRotation += m_sceneGraph.UpdatePrimGroupRotation; | 2969 | client.OnUpdatePrimGroupMouseRotation += m_sceneGraph.UpdatePrimGroupRotation; |
2844 | client.OnUpdatePrimSingleRotation += m_sceneGraph.UpdatePrimSingleRotation; | 2970 | client.OnUpdatePrimSingleRotation += m_sceneGraph.UpdatePrimSingleRotation; |
@@ -2895,6 +3021,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2895 | client.OnFetchInventory += m_asyncInventorySender.HandleFetchInventory; | 3021 | client.OnFetchInventory += m_asyncInventorySender.HandleFetchInventory; |
2896 | client.OnUpdateInventoryItem += UpdateInventoryItemAsset; | 3022 | client.OnUpdateInventoryItem += UpdateInventoryItemAsset; |
2897 | client.OnCopyInventoryItem += CopyInventoryItem; | 3023 | client.OnCopyInventoryItem += CopyInventoryItem; |
3024 | client.OnMoveItemsAndLeaveCopy += MoveInventoryItemsLeaveCopy; | ||
2898 | client.OnMoveInventoryItem += MoveInventoryItem; | 3025 | client.OnMoveInventoryItem += MoveInventoryItem; |
2899 | client.OnRemoveInventoryItem += RemoveInventoryItem; | 3026 | client.OnRemoveInventoryItem += RemoveInventoryItem; |
2900 | client.OnRemoveInventoryFolder += RemoveInventoryFolder; | 3027 | client.OnRemoveInventoryFolder += RemoveInventoryFolder; |
@@ -2966,6 +3093,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2966 | client.OnUpdatePrimGroupPosition -= m_sceneGraph.UpdatePrimGroupPosition; | 3093 | client.OnUpdatePrimGroupPosition -= m_sceneGraph.UpdatePrimGroupPosition; |
2967 | client.OnUpdatePrimSinglePosition -= m_sceneGraph.UpdatePrimSinglePosition; | 3094 | client.OnUpdatePrimSinglePosition -= m_sceneGraph.UpdatePrimSinglePosition; |
2968 | 3095 | ||
3096 | client.onClientChangeObject -= m_sceneGraph.ClientChangeObject; | ||
3097 | |||
2969 | client.OnUpdatePrimGroupRotation -= m_sceneGraph.UpdatePrimGroupRotation; | 3098 | client.OnUpdatePrimGroupRotation -= m_sceneGraph.UpdatePrimGroupRotation; |
2970 | client.OnUpdatePrimGroupMouseRotation -= m_sceneGraph.UpdatePrimGroupRotation; | 3099 | client.OnUpdatePrimGroupMouseRotation -= m_sceneGraph.UpdatePrimGroupRotation; |
2971 | client.OnUpdatePrimSingleRotation -= m_sceneGraph.UpdatePrimSingleRotation; | 3100 | client.OnUpdatePrimSingleRotation -= m_sceneGraph.UpdatePrimSingleRotation; |
@@ -3068,15 +3197,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
3068 | /// </summary> | 3197 | /// </summary> |
3069 | /// <param name="agentId">The avatar's Unique ID</param> | 3198 | /// <param name="agentId">The avatar's Unique ID</param> |
3070 | /// <param name="client">The IClientAPI for the client</param> | 3199 | /// <param name="client">The IClientAPI for the client</param> |
3071 | public virtual void TeleportClientHome(UUID agentId, IClientAPI client) | 3200 | public virtual bool TeleportClientHome(UUID agentId, IClientAPI client) |
3072 | { | 3201 | { |
3073 | if (m_teleportModule != null) | 3202 | if (m_teleportModule != null) |
3074 | m_teleportModule.TeleportHome(agentId, client); | 3203 | return m_teleportModule.TeleportHome(agentId, client); |
3075 | else | 3204 | else |
3076 | { | 3205 | { |
3077 | m_log.DebugFormat("[SCENE]: Unable to teleport user home: no AgentTransferModule is active"); | 3206 | m_log.DebugFormat("[SCENE]: Unable to teleport user home: no AgentTransferModule is active"); |
3078 | client.SendTeleportFailed("Unable to perform teleports on this simulator."); | 3207 | client.SendTeleportFailed("Unable to perform teleports on this simulator."); |
3079 | } | 3208 | } |
3209 | return false; | ||
3080 | } | 3210 | } |
3081 | 3211 | ||
3082 | /// <summary> | 3212 | /// <summary> |
@@ -3186,6 +3316,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
3186 | /// <param name="flags"></param> | 3316 | /// <param name="flags"></param> |
3187 | public virtual void SetHomeRezPoint(IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags) | 3317 | public virtual void SetHomeRezPoint(IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags) |
3188 | { | 3318 | { |
3319 | //Add half the avatar's height so that the user doesn't fall through prims | ||
3320 | ScenePresence presence; | ||
3321 | if (TryGetScenePresence(remoteClient.AgentId, out presence)) | ||
3322 | { | ||
3323 | if (presence.Appearance != null) | ||
3324 | { | ||
3325 | position.Z = position.Z + (presence.Appearance.AvatarHeight / 2); | ||
3326 | } | ||
3327 | } | ||
3328 | |||
3189 | if (GridUserService != null && GridUserService.SetHome(remoteClient.AgentId.ToString(), RegionInfo.RegionID, position, lookAt)) | 3329 | if (GridUserService != null && GridUserService.SetHome(remoteClient.AgentId.ToString(), RegionInfo.RegionID, position, lookAt)) |
3190 | // FUBAR ALERT: this needs to be "Home position set." so the viewer saves a home-screenshot. | 3330 | // FUBAR ALERT: this needs to be "Home position set." so the viewer saves a home-screenshot. |
3191 | m_dialogModule.SendAlertToUser(remoteClient, "Home position set."); | 3331 | m_dialogModule.SendAlertToUser(remoteClient, "Home position set."); |
@@ -3254,8 +3394,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
3254 | regions.Remove(RegionInfo.RegionHandle); | 3394 | regions.Remove(RegionInfo.RegionHandle); |
3255 | m_sceneGridService.SendCloseChildAgentConnections(agentID, regions); | 3395 | m_sceneGridService.SendCloseChildAgentConnections(agentID, regions); |
3256 | } | 3396 | } |
3257 | 3397 | m_log.Debug("[Scene] Beginning ClientClosed"); | |
3258 | m_eventManager.TriggerClientClosed(agentID, this); | 3398 | m_eventManager.TriggerClientClosed(agentID, this); |
3399 | m_log.Debug("[Scene] Finished ClientClosed"); | ||
3259 | } | 3400 | } |
3260 | catch (NullReferenceException) | 3401 | catch (NullReferenceException) |
3261 | { | 3402 | { |
@@ -3317,9 +3458,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
3317 | { | 3458 | { |
3318 | m_log.ErrorFormat("[SCENE] Scene.cs:RemoveClient exception {0}{1}", e.Message, e.StackTrace); | 3459 | m_log.ErrorFormat("[SCENE] Scene.cs:RemoveClient exception {0}{1}", e.Message, e.StackTrace); |
3319 | } | 3460 | } |
3320 | 3461 | m_log.Debug("[Scene] Done. Firing RemoveCircuit"); | |
3321 | m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode); | 3462 | m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode); |
3322 | // CleanDroppedAttachments(); | 3463 | // CleanDroppedAttachments(); |
3464 | m_log.Debug("[Scene] The avatar has left the building"); | ||
3323 | //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false)); | 3465 | //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false)); |
3324 | //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true)); | 3466 | //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true)); |
3325 | } | 3467 | } |
@@ -3441,13 +3583,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
3441 | sp = null; | 3583 | sp = null; |
3442 | } | 3584 | } |
3443 | 3585 | ||
3444 | ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y); | ||
3445 | 3586 | ||
3446 | //On login test land permisions | 3587 | //On login test land permisions |
3447 | if (vialogin) | 3588 | if (vialogin) |
3448 | { | 3589 | { |
3449 | if (land != null && !TestLandRestrictions(agent, land, out reason)) | 3590 | IUserAccountCacheModule cache = RequestModuleInterface<IUserAccountCacheModule>(); |
3591 | if (cache != null) | ||
3592 | cache.Remove(agent.firstname + " " + agent.lastname); | ||
3593 | if (!TestLandRestrictions(agent.AgentID, out reason, ref agent.startpos.X, ref agent.startpos.Y)) | ||
3450 | { | 3594 | { |
3595 | m_log.DebugFormat("[CONNECTION BEGIN]: Denying access to {0} due to no land access", agent.AgentID.ToString()); | ||
3451 | return false; | 3596 | return false; |
3452 | } | 3597 | } |
3453 | } | 3598 | } |
@@ -3471,8 +3616,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
3471 | 3616 | ||
3472 | try | 3617 | try |
3473 | { | 3618 | { |
3474 | if (!AuthorizeUser(agent, out reason)) | 3619 | // Always check estate if this is a login. Always |
3475 | return false; | 3620 | // check if banned regions are to be blacked out. |
3621 | if (vialogin || (!m_seeIntoBannedRegion)) | ||
3622 | { | ||
3623 | if (!AuthorizeUser(agent, out reason)) | ||
3624 | return false; | ||
3625 | } | ||
3476 | } | 3626 | } |
3477 | catch (Exception e) | 3627 | catch (Exception e) |
3478 | { | 3628 | { |
@@ -3598,6 +3748,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3598 | } | 3748 | } |
3599 | 3749 | ||
3600 | // Honor parcel landing type and position. | 3750 | // Honor parcel landing type and position. |
3751 | /* | ||
3752 | ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y); | ||
3601 | if (land != null) | 3753 | if (land != null) |
3602 | { | 3754 | { |
3603 | if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero) | 3755 | if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero) |
@@ -3605,26 +3757,34 @@ namespace OpenSim.Region.Framework.Scenes | |||
3605 | agent.startpos = land.LandData.UserLocation; | 3757 | agent.startpos = land.LandData.UserLocation; |
3606 | } | 3758 | } |
3607 | } | 3759 | } |
3760 | */// This is now handled properly in ScenePresence.MakeRootAgent | ||
3608 | } | 3761 | } |
3609 | 3762 | ||
3610 | return true; | 3763 | return true; |
3611 | } | 3764 | } |
3612 | 3765 | ||
3613 | private bool TestLandRestrictions(AgentCircuitData agent, ILandObject land, out string reason) | 3766 | public bool TestLandRestrictions(UUID agentID, out string reason, ref float posX, ref float posY) |
3614 | { | 3767 | { |
3615 | 3768 | reason = String.Empty; | |
3616 | bool banned = land.IsBannedFromLand(agent.AgentID); | 3769 | if (Permissions.IsGod(agentID)) |
3617 | bool restricted = land.IsRestrictedFromLand(agent.AgentID); | 3770 | return true; |
3771 | |||
3772 | ILandObject land = LandChannel.GetLandObject(posX, posY); | ||
3773 | if (land == null) | ||
3774 | return false; | ||
3775 | |||
3776 | bool banned = land.IsBannedFromLand(agentID); | ||
3777 | bool restricted = land.IsRestrictedFromLand(agentID); | ||
3618 | 3778 | ||
3619 | if (banned || restricted) | 3779 | if (banned || restricted) |
3620 | { | 3780 | { |
3621 | ILandObject nearestParcel = GetNearestAllowedParcel(agent.AgentID, agent.startpos.X, agent.startpos.Y); | 3781 | ILandObject nearestParcel = GetNearestAllowedParcel(agentID, posX, posY); |
3622 | if (nearestParcel != null) | 3782 | if (nearestParcel != null) |
3623 | { | 3783 | { |
3624 | //Move agent to nearest allowed | 3784 | //Move agent to nearest allowed |
3625 | Vector3 newPosition = GetParcelCenterAtGround(nearestParcel); | 3785 | Vector3 newPosition = GetParcelCenterAtGround(nearestParcel); |
3626 | agent.startpos.X = newPosition.X; | 3786 | posX = newPosition.X; |
3627 | agent.startpos.Y = newPosition.Y; | 3787 | posY = newPosition.Y; |
3628 | } | 3788 | } |
3629 | else | 3789 | else |
3630 | { | 3790 | { |
@@ -3686,7 +3846,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3686 | 3846 | ||
3687 | if (!m_strictAccessControl) return true; | 3847 | if (!m_strictAccessControl) return true; |
3688 | if (Permissions.IsGod(agent.AgentID)) return true; | 3848 | if (Permissions.IsGod(agent.AgentID)) return true; |
3689 | 3849 | ||
3690 | if (AuthorizationService != null) | 3850 | if (AuthorizationService != null) |
3691 | { | 3851 | { |
3692 | if (!AuthorizationService.IsAuthorizedForRegion( | 3852 | if (!AuthorizationService.IsAuthorizedForRegion( |
@@ -3701,7 +3861,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3701 | 3861 | ||
3702 | if (m_regInfo.EstateSettings != null) | 3862 | if (m_regInfo.EstateSettings != null) |
3703 | { | 3863 | { |
3704 | if (m_regInfo.EstateSettings.IsBanned(agent.AgentID)) | 3864 | if (m_regInfo.EstateSettings.IsBanned(agent.AgentID,0)) |
3705 | { | 3865 | { |
3706 | m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist", | 3866 | m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist", |
3707 | agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); | 3867 | agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); |
@@ -3893,6 +4053,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
3893 | 4053 | ||
3894 | // We have to wait until the viewer contacts this region after receiving EAC. | 4054 | // We have to wait until the viewer contacts this region after receiving EAC. |
3895 | // That calls AddNewClient, which finally creates the ScenePresence | 4055 | // That calls AddNewClient, which finally creates the ScenePresence |
4056 | int flags = GetUserFlags(cAgentData.AgentID); | ||
4057 | if (m_regInfo.EstateSettings.IsBanned(cAgentData.AgentID, flags)) | ||
4058 | { | ||
4059 | m_log.DebugFormat("[SCENE]: Denying root agent entry to {0}: banned", cAgentData.AgentID); | ||
4060 | return false; | ||
4061 | } | ||
4062 | |||
3896 | ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2); | 4063 | ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2); |
3897 | if (nearestParcel == null) | 4064 | if (nearestParcel == null) |
3898 | { | 4065 | { |
@@ -3974,12 +4141,22 @@ namespace OpenSim.Region.Framework.Scenes | |||
3974 | return false; | 4141 | return false; |
3975 | } | 4142 | } |
3976 | 4143 | ||
4144 | public bool IncomingCloseAgent(UUID agentID) | ||
4145 | { | ||
4146 | return IncomingCloseAgent(agentID, false); | ||
4147 | } | ||
4148 | |||
4149 | public bool IncomingCloseChildAgent(UUID agentID) | ||
4150 | { | ||
4151 | return IncomingCloseAgent(agentID, true); | ||
4152 | } | ||
4153 | |||
3977 | /// <summary> | 4154 | /// <summary> |
3978 | /// Tell a single agent to disconnect from the region. | 4155 | /// Tell a single agent to disconnect from the region. |
3979 | /// </summary> | 4156 | /// </summary> |
3980 | /// <param name="regionHandle"></param> | ||
3981 | /// <param name="agentID"></param> | 4157 | /// <param name="agentID"></param> |
3982 | public bool IncomingCloseAgent(UUID agentID) | 4158 | /// <param name="childOnly"></param> |
4159 | public bool IncomingCloseAgent(UUID agentID, bool childOnly) | ||
3983 | { | 4160 | { |
3984 | //m_log.DebugFormat("[SCENE]: Processing incoming close agent for {0}", agentID); | 4161 | //m_log.DebugFormat("[SCENE]: Processing incoming close agent for {0}", agentID); |
3985 | 4162 | ||
@@ -3991,7 +4168,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3991 | { | 4168 | { |
3992 | m_sceneGraph.removeUserCount(false); | 4169 | m_sceneGraph.removeUserCount(false); |
3993 | } | 4170 | } |
3994 | else | 4171 | else if (!childOnly) |
3995 | { | 4172 | { |
3996 | m_sceneGraph.removeUserCount(true); | 4173 | m_sceneGraph.removeUserCount(true); |
3997 | } | 4174 | } |
@@ -4007,9 +4184,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
4007 | } | 4184 | } |
4008 | else | 4185 | else |
4009 | presence.ControllingClient.SendShutdownConnectionNotice(); | 4186 | presence.ControllingClient.SendShutdownConnectionNotice(); |
4187 | presence.ControllingClient.Close(false); | ||
4188 | } | ||
4189 | else if (!childOnly) | ||
4190 | { | ||
4191 | presence.ControllingClient.Close(true); | ||
4010 | } | 4192 | } |
4011 | |||
4012 | presence.ControllingClient.Close(); | ||
4013 | return true; | 4193 | return true; |
4014 | } | 4194 | } |
4015 | 4195 | ||
@@ -4591,35 +4771,81 @@ namespace OpenSim.Region.Framework.Scenes | |||
4591 | SimulationDataService.RemoveObject(uuid, m_regInfo.RegionID); | 4771 | SimulationDataService.RemoveObject(uuid, m_regInfo.RegionID); |
4592 | } | 4772 | } |
4593 | 4773 | ||
4594 | public int GetHealth() | 4774 | public int GetHealth(out int flags, out string message) |
4595 | { | 4775 | { |
4596 | // Returns: | 4776 | // Returns: |
4597 | // 1 = sim is up and accepting http requests. The heartbeat has | 4777 | // 1 = sim is up and accepting http requests. The heartbeat has |
4598 | // stopped and the sim is probably locked up, but a remote | 4778 | // stopped and the sim is probably locked up, but a remote |
4599 | // admin restart may succeed | 4779 | // admin restart may succeed |
4600 | // | 4780 | // |
4601 | // 2 = Sim is up and the heartbeat is running. The sim is likely | 4781 | // 2 = Sim is up and the heartbeat is running. The sim is likely |
4602 | // usable for people within and logins _may_ work | 4782 | // usable for people within |
4783 | // | ||
4784 | // 3 = Sim is up and one packet thread is running. Sim is | ||
4785 | // unstable and will not accept new logins | ||
4603 | // | 4786 | // |
4604 | // 3 = We have seen a new user enter within the past 4 minutes | 4787 | // 4 = Sim is up and both packet threads are running. Sim is |
4788 | // likely usable | ||
4789 | // | ||
4790 | // 5 = We have seen a new user enter within the past 4 minutes | ||
4605 | // which can be seen as positive confirmation of sim health | 4791 | // which can be seen as positive confirmation of sim health |
4606 | // | 4792 | // |
4793 | |||
4794 | flags = 0; | ||
4795 | message = String.Empty; | ||
4796 | |||
4797 | CheckHeartbeat(); | ||
4798 | |||
4799 | if (m_firstHeartbeat || (m_lastIncoming == 0 && m_lastOutgoing == 0)) | ||
4800 | { | ||
4801 | // We're still starting | ||
4802 | // 0 means "in startup", it can't happen another way, since | ||
4803 | // to get here, we must be able to accept http connections | ||
4804 | return 0; | ||
4805 | } | ||
4806 | |||
4607 | int health=1; // Start at 1, means we're up | 4807 | int health=1; // Start at 1, means we're up |
4608 | 4808 | ||
4609 | if ((Util.EnvironmentTickCountSubtract(m_lastFrameTick)) < 1000) | 4809 | if ((Util.EnvironmentTickCountSubtract(m_lastFrameTick)) < 1000) |
4610 | health += 1; | 4810 | { |
4811 | health+=1; | ||
4812 | flags |= 1; | ||
4813 | } | ||
4814 | |||
4815 | if (Util.EnvironmentTickCountSubtract(m_lastIncoming) < 1000) | ||
4816 | { | ||
4817 | health+=1; | ||
4818 | flags |= 2; | ||
4819 | } | ||
4820 | |||
4821 | if (Util.EnvironmentTickCountSubtract(m_lastOutgoing) < 1000) | ||
4822 | { | ||
4823 | health+=1; | ||
4824 | flags |= 4; | ||
4825 | } | ||
4611 | else | 4826 | else |
4827 | { | ||
4828 | int pid = System.Diagnostics.Process.GetCurrentProcess().Id; | ||
4829 | System.Diagnostics.Process proc = new System.Diagnostics.Process(); | ||
4830 | proc.EnableRaisingEvents=false; | ||
4831 | proc.StartInfo.FileName = "/bin/kill"; | ||
4832 | proc.StartInfo.Arguments = "-QUIT " + pid.ToString(); | ||
4833 | proc.Start(); | ||
4834 | proc.WaitForExit(); | ||
4835 | Thread.Sleep(1000); | ||
4836 | Environment.Exit(1); | ||
4837 | } | ||
4838 | |||
4839 | if (flags != 7) | ||
4612 | return health; | 4840 | return health; |
4613 | 4841 | ||
4614 | // A login in the last 4 mins? We can't be doing too badly | 4842 | // A login in the last 4 mins? We can't be doing too badly |
4615 | // | 4843 | // |
4616 | if ((Util.EnvironmentTickCountSubtract(m_LastLogin)) < 240000) | 4844 | if (Util.EnvironmentTickCountSubtract(m_LastLogin) < 240000) |
4617 | health++; | 4845 | health++; |
4618 | else | 4846 | else |
4619 | return health; | 4847 | return health; |
4620 | 4848 | ||
4621 | // CheckHeartbeat(); | ||
4622 | |||
4623 | return health; | 4849 | return health; |
4624 | } | 4850 | } |
4625 | 4851 | ||
@@ -4707,7 +4933,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4707 | bool wasUsingPhysics = ((jointProxyObject.Flags & PrimFlags.Physics) != 0); | 4933 | bool wasUsingPhysics = ((jointProxyObject.Flags & PrimFlags.Physics) != 0); |
4708 | if (wasUsingPhysics) | 4934 | if (wasUsingPhysics) |
4709 | { | 4935 | { |
4710 | jointProxyObject.UpdatePrimFlags(false, false, true, false); // FIXME: possible deadlock here; check to make sure all the scene alterations set into motion here won't deadlock | 4936 | jointProxyObject.UpdatePrimFlags(false, false, true, false,false); // FIXME: possible deadlock here; check to make sure all the scene alterations set into motion here won't deadlock |
4711 | } | 4937 | } |
4712 | } | 4938 | } |
4713 | 4939 | ||
@@ -4806,14 +5032,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
4806 | return (((vsn.X * xdiff) + (vsn.Y * ydiff)) / (-1 * vsn.Z)) + p0.Z; | 5032 | return (((vsn.X * xdiff) + (vsn.Y * ydiff)) / (-1 * vsn.Z)) + p0.Z; |
4807 | } | 5033 | } |
4808 | 5034 | ||
4809 | // private void CheckHeartbeat() | 5035 | private void CheckHeartbeat() |
4810 | // { | 5036 | { |
4811 | // if (m_firstHeartbeat) | 5037 | if (m_firstHeartbeat) |
4812 | // return; | 5038 | return; |
4813 | // | 5039 | |
4814 | // if (Util.EnvironmentTickCountSubtract(m_lastFrameTick) > 2000) | 5040 | if ((Util.EnvironmentTickCountSubtract(m_lastFrameTick)) > 5000) |
4815 | // StartTimer(); | 5041 | Start(); |
4816 | // } | 5042 | } |
4817 | 5043 | ||
4818 | public override ISceneObject DeserializeObject(string representation) | 5044 | public override ISceneObject DeserializeObject(string representation) |
4819 | { | 5045 | { |
@@ -4825,9 +5051,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
4825 | get { return m_allowScriptCrossings; } | 5051 | get { return m_allowScriptCrossings; } |
4826 | } | 5052 | } |
4827 | 5053 | ||
4828 | public Vector3? GetNearestAllowedPosition(ScenePresence avatar) | 5054 | public Vector3 GetNearestAllowedPosition(ScenePresence avatar) |
5055 | { | ||
5056 | return GetNearestAllowedPosition(avatar, null); | ||
5057 | } | ||
5058 | |||
5059 | public Vector3 GetNearestAllowedPosition(ScenePresence avatar, ILandObject excludeParcel) | ||
4829 | { | 5060 | { |
4830 | ILandObject nearestParcel = GetNearestAllowedParcel(avatar.UUID, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | 5061 | ILandObject nearestParcel = GetNearestAllowedParcel(avatar.UUID, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, excludeParcel); |
4831 | 5062 | ||
4832 | if (nearestParcel != null) | 5063 | if (nearestParcel != null) |
4833 | { | 5064 | { |
@@ -4836,10 +5067,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4836 | Vector3? nearestPoint = GetNearestPointInParcelAlongDirectionFromPoint(avatar.AbsolutePosition, dir, nearestParcel); | 5067 | Vector3? nearestPoint = GetNearestPointInParcelAlongDirectionFromPoint(avatar.AbsolutePosition, dir, nearestParcel); |
4837 | if (nearestPoint != null) | 5068 | if (nearestPoint != null) |
4838 | { | 5069 | { |
4839 | // m_log.DebugFormat( | 5070 | Debug.WriteLine("Found a sane previous position based on velocity, sending them to: " + nearestPoint.ToString()); |
4840 | // "[SCENE]: Found a sane previous position based on velocity for {0}, sending them to {1} in {2}", | ||
4841 | // avatar.Name, nearestPoint, nearestParcel.LandData.Name); | ||
4842 | |||
4843 | return nearestPoint.Value; | 5071 | return nearestPoint.Value; |
4844 | } | 5072 | } |
4845 | 5073 | ||
@@ -4849,17 +5077,20 @@ namespace OpenSim.Region.Framework.Scenes | |||
4849 | nearestPoint = GetNearestPointInParcelAlongDirectionFromPoint(avatar.AbsolutePosition, dir, nearestParcel); | 5077 | nearestPoint = GetNearestPointInParcelAlongDirectionFromPoint(avatar.AbsolutePosition, dir, nearestParcel); |
4850 | if (nearestPoint != null) | 5078 | if (nearestPoint != null) |
4851 | { | 5079 | { |
4852 | // m_log.DebugFormat( | 5080 | Debug.WriteLine("They had a zero velocity, sending them to: " + nearestPoint.ToString()); |
4853 | // "[SCENE]: {0} had a zero velocity, sending them to {1}", avatar.Name, nearestPoint); | ||
4854 | |||
4855 | return nearestPoint.Value; | 5081 | return nearestPoint.Value; |
4856 | } | 5082 | } |
4857 | 5083 | ||
4858 | //Ultimate backup if we have no idea where they are | 5084 | ILandObject dest = LandChannel.GetLandObject(avatar.lastKnownAllowedPosition.X, avatar.lastKnownAllowedPosition.Y); |
4859 | // m_log.DebugFormat( | 5085 | if (dest != excludeParcel) |
4860 | // "[SCENE]: No idea where {0} is, sending them to {1}", avatar.Name, avatar.lastKnownAllowedPosition); | 5086 | { |
5087 | // Ultimate backup if we have no idea where they are and | ||
5088 | // the last allowed position was in another parcel | ||
5089 | Debug.WriteLine("Have no idea where they are, sending them to: " + avatar.lastKnownAllowedPosition.ToString()); | ||
5090 | return avatar.lastKnownAllowedPosition; | ||
5091 | } | ||
4861 | 5092 | ||
4862 | return avatar.lastKnownAllowedPosition; | 5093 | // else fall through to region edge |
4863 | } | 5094 | } |
4864 | 5095 | ||
4865 | //Go to the edge, this happens in teleporting to a region with no available parcels | 5096 | //Go to the edge, this happens in teleporting to a region with no available parcels |
@@ -4893,13 +5124,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
4893 | 5124 | ||
4894 | public ILandObject GetNearestAllowedParcel(UUID avatarId, float x, float y) | 5125 | public ILandObject GetNearestAllowedParcel(UUID avatarId, float x, float y) |
4895 | { | 5126 | { |
5127 | return GetNearestAllowedParcel(avatarId, x, y, null); | ||
5128 | } | ||
5129 | |||
5130 | public ILandObject GetNearestAllowedParcel(UUID avatarId, float x, float y, ILandObject excludeParcel) | ||
5131 | { | ||
4896 | List<ILandObject> all = AllParcels(); | 5132 | List<ILandObject> all = AllParcels(); |
4897 | float minParcelDistance = float.MaxValue; | 5133 | float minParcelDistance = float.MaxValue; |
4898 | ILandObject nearestParcel = null; | 5134 | ILandObject nearestParcel = null; |
4899 | 5135 | ||
4900 | foreach (var parcel in all) | 5136 | foreach (var parcel in all) |
4901 | { | 5137 | { |
4902 | if (!parcel.IsEitherBannedOrRestricted(avatarId)) | 5138 | if (!parcel.IsEitherBannedOrRestricted(avatarId) && parcel != excludeParcel) |
4903 | { | 5139 | { |
4904 | float parcelDistance = GetParcelDistancefromPoint(parcel, x, y); | 5140 | float parcelDistance = GetParcelDistancefromPoint(parcel, x, y); |
4905 | if (parcelDistance < minParcelDistance) | 5141 | if (parcelDistance < minParcelDistance) |
@@ -5141,7 +5377,55 @@ namespace OpenSim.Region.Framework.Scenes | |||
5141 | mapModule.GenerateMaptile(); | 5377 | mapModule.GenerateMaptile(); |
5142 | } | 5378 | } |
5143 | 5379 | ||
5144 | private void RegenerateMaptileAndReregister(object sender, ElapsedEventArgs e) | 5380 | // public void CleanDroppedAttachments() |
5381 | // { | ||
5382 | // List<SceneObjectGroup> objectsToDelete = | ||
5383 | // new List<SceneObjectGroup>(); | ||
5384 | // | ||
5385 | // lock (m_cleaningAttachments) | ||
5386 | // { | ||
5387 | // ForEachSOG(delegate (SceneObjectGroup grp) | ||
5388 | // { | ||
5389 | // if (grp.RootPart.Shape.PCode == 0 && grp.RootPart.Shape.State != 0 && (!objectsToDelete.Contains(grp))) | ||
5390 | // { | ||
5391 | // UUID agentID = grp.OwnerID; | ||
5392 | // if (agentID == UUID.Zero) | ||
5393 | // { | ||
5394 | // objectsToDelete.Add(grp); | ||
5395 | // return; | ||
5396 | // } | ||
5397 | // | ||
5398 | // ScenePresence sp = GetScenePresence(agentID); | ||
5399 | // if (sp == null) | ||
5400 | // { | ||
5401 | // objectsToDelete.Add(grp); | ||
5402 | // return; | ||
5403 | // } | ||
5404 | // } | ||
5405 | // }); | ||
5406 | // } | ||
5407 | // | ||
5408 | // foreach (SceneObjectGroup grp in objectsToDelete) | ||
5409 | // { | ||
5410 | // m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID); | ||
5411 | // DeleteSceneObject(grp, true); | ||
5412 | // } | ||
5413 | // } | ||
5414 | |||
5415 | public void ThreadAlive(int threadCode) | ||
5416 | { | ||
5417 | switch(threadCode) | ||
5418 | { | ||
5419 | case 1: // Incoming | ||
5420 | m_lastIncoming = Util.EnvironmentTickCount(); | ||
5421 | break; | ||
5422 | case 2: // Incoming | ||
5423 | m_lastOutgoing = Util.EnvironmentTickCount(); | ||
5424 | break; | ||
5425 | } | ||
5426 | } | ||
5427 | |||
5428 | public void RegenerateMaptileAndReregister(object sender, ElapsedEventArgs e) | ||
5145 | { | 5429 | { |
5146 | RegenerateMaptile(); | 5430 | RegenerateMaptile(); |
5147 | 5431 | ||
@@ -5160,6 +5444,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
5160 | // child agent creation, thereby emulating the SL behavior. | 5444 | // child agent creation, thereby emulating the SL behavior. |
5161 | public bool QueryAccess(UUID agentID, Vector3 position, out string reason) | 5445 | public bool QueryAccess(UUID agentID, Vector3 position, out string reason) |
5162 | { | 5446 | { |
5447 | reason = "You are banned from the region"; | ||
5448 | |||
5449 | if (Permissions.IsGod(agentID)) | ||
5450 | { | ||
5451 | reason = String.Empty; | ||
5452 | return true; | ||
5453 | } | ||
5454 | |||
5163 | int num = m_sceneGraph.GetNumberOfScenePresences(); | 5455 | int num = m_sceneGraph.GetNumberOfScenePresences(); |
5164 | 5456 | ||
5165 | if (num >= RegionInfo.RegionSettings.AgentLimit) | 5457 | if (num >= RegionInfo.RegionSettings.AgentLimit) |
@@ -5171,6 +5463,41 @@ namespace OpenSim.Region.Framework.Scenes | |||
5171 | } | 5463 | } |
5172 | } | 5464 | } |
5173 | 5465 | ||
5466 | ScenePresence presence = GetScenePresence(agentID); | ||
5467 | IClientAPI client = null; | ||
5468 | AgentCircuitData aCircuit = null; | ||
5469 | |||
5470 | if (presence != null) | ||
5471 | { | ||
5472 | client = presence.ControllingClient; | ||
5473 | if (client != null) | ||
5474 | aCircuit = client.RequestClientInfo(); | ||
5475 | } | ||
5476 | |||
5477 | // We may be called before there is a presence or a client. | ||
5478 | // Fake AgentCircuitData to keep IAuthorizationModule smiling | ||
5479 | if (client == null) | ||
5480 | { | ||
5481 | aCircuit = new AgentCircuitData(); | ||
5482 | aCircuit.AgentID = agentID; | ||
5483 | aCircuit.firstname = String.Empty; | ||
5484 | aCircuit.lastname = String.Empty; | ||
5485 | } | ||
5486 | |||
5487 | try | ||
5488 | { | ||
5489 | if (!AuthorizeUser(aCircuit, out reason)) | ||
5490 | { | ||
5491 | // m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID); | ||
5492 | return false; | ||
5493 | } | ||
5494 | } | ||
5495 | catch (Exception e) | ||
5496 | { | ||
5497 | m_log.DebugFormat("[SCENE]: Exception authorizing agent: {0} "+ e.StackTrace, e.Message); | ||
5498 | return false; | ||
5499 | } | ||
5500 | |||
5174 | if (position == Vector3.Zero) // Teleport | 5501 | if (position == Vector3.Zero) // Teleport |
5175 | { | 5502 | { |
5176 | if (!RegionInfo.EstateSettings.AllowDirectTeleport) | 5503 | if (!RegionInfo.EstateSettings.AllowDirectTeleport) |
@@ -5199,13 +5526,46 @@ namespace OpenSim.Region.Framework.Scenes | |||
5199 | } | 5526 | } |
5200 | } | 5527 | } |
5201 | } | 5528 | } |
5529 | |||
5530 | float posX = 128.0f; | ||
5531 | float posY = 128.0f; | ||
5532 | |||
5533 | if (!TestLandRestrictions(agentID, out reason, ref posX, ref posY)) | ||
5534 | { | ||
5535 | // m_log.DebugFormat("[SCENE]: Denying {0} because they are banned on all parcels", agentID); | ||
5536 | return false; | ||
5537 | } | ||
5538 | } | ||
5539 | else // Walking | ||
5540 | { | ||
5541 | ILandObject land = LandChannel.GetLandObject(position.X, position.Y); | ||
5542 | if (land == null) | ||
5543 | return false; | ||
5544 | |||
5545 | bool banned = land.IsBannedFromLand(agentID); | ||
5546 | bool restricted = land.IsRestrictedFromLand(agentID); | ||
5547 | |||
5548 | if (banned || restricted) | ||
5549 | return false; | ||
5202 | } | 5550 | } |
5203 | 5551 | ||
5204 | reason = String.Empty; | 5552 | reason = String.Empty; |
5205 | return true; | 5553 | return true; |
5206 | } | 5554 | } |
5207 | 5555 | ||
5208 | /// <summary> | 5556 | public void StartTimerWatchdog() |
5557 | { | ||
5558 | m_timerWatchdog.Interval = 1000; | ||
5559 | m_timerWatchdog.Elapsed += TimerWatchdog; | ||
5560 | m_timerWatchdog.AutoReset = true; | ||
5561 | m_timerWatchdog.Start(); | ||
5562 | } | ||
5563 | |||
5564 | public void TimerWatchdog(object sender, ElapsedEventArgs e) | ||
5565 | { | ||
5566 | CheckHeartbeat(); | ||
5567 | } | ||
5568 | |||
5209 | /// This method deals with movement when an avatar is automatically moving (but this is distinct from the | 5569 | /// This method deals with movement when an avatar is automatically moving (but this is distinct from the |
5210 | /// autopilot that moves an avatar to a sit target!. | 5570 | /// autopilot that moves an avatar to a sit target!. |
5211 | /// </summary> | 5571 | /// </summary> |