From 1a6694b26487e4b9bd33e1c6c4415fb7d36f0d1d Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Tue, 25 Dec 2012 10:47:45 +0200
Subject: Fixed several problems with the Sun: some settings didn't work, or
were inconsistently used. - The sun position is always calculated by
combining the sun settings in the Region and Estate. This fixes the problem
that 'UseEstateSun' didn't work. - To remove ambiguity, the
EstateToolsSunUpdate event no longer accepts the sun's position as
parameters. That's because the position is always calculated from the Region
and Estate settings. - Use only the 'FixedSun' flag to determine whether the
sun is fixed; not the 'UseGlobalTime' flag. - Don't change the region's
'SunPosition' field according to the sun's position: this field is used only
to set the position when using a FixedSun. (The 'SunVector' field does get
updated according to the sun's position in the sky)
---
OpenSim/Region/Framework/Scenes/EventManager.cs | 13 +++++-------
OpenSim/Region/Framework/Scenes/Scene.cs | 28 +------------------------
2 files changed, 6 insertions(+), 35 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 4c49b71..6b08e0f 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -751,7 +751,7 @@ namespace OpenSim.Region.Framework.Scenes
public event ScriptTimerEvent OnScriptTimerEvent;
*/
- public delegate void EstateToolsSunUpdate(ulong regionHandle, bool FixedTime, bool EstateSun, float LindenHour);
+ public delegate void EstateToolsSunUpdate(ulong regionHandle);
public delegate void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID);
public event EstateToolsSunUpdate OnEstateToolsSunUpdate;
@@ -2507,13 +2507,10 @@ namespace OpenSim.Region.Framework.Scenes
}
/// <summary>
- /// Updates the system as to how the position of the sun should be handled.
+ /// Called when the sun's position parameters have changed in the Region and/or Estate
/// </summary>
- /// <param name="regionHandle"></param>
- /// <param name="FixedTime">True if the Sun Position is fixed</param>
- /// <param name="useEstateTime">True if the Estate Settings should be used instead of region</param>
- /// <param name="FixedSunHour">The hour 0.0 <= FixedSunHour <= 24.0 at which the sun is fixed at. Sun Hour 0 is sun-rise, when Day/Night ratio is 1:1</param>
- public void TriggerEstateToolsSunUpdate(ulong regionHandle, bool FixedTime, bool useEstateTime, float FixedSunHour)
+ /// <param name="regionHandle">The region that changed</param>
+ public void TriggerEstateToolsSunUpdate(ulong regionHandle)
{
EstateToolsSunUpdate handlerEstateToolsSunUpdate = OnEstateToolsSunUpdate;
if (handlerEstateToolsSunUpdate != null)
@@ -2522,7 +2519,7 @@ namespace OpenSim.Region.Framework.Scenes
{
try
{
- d(regionHandle, FixedTime, useEstateTime, FixedSunHour);
+ d(regionHandle);
}
catch (Exception e)
{
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index cca295c..11b63b7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5345,33 +5345,7 @@ namespace OpenSim.Region.Framework.Scenes
public void TriggerEstateSunUpdate()
{
- float sun;
- if (RegionInfo.RegionSettings.UseEstateSun)
- {
- sun = (float)RegionInfo.EstateSettings.SunPosition;
- if (RegionInfo.EstateSettings.UseGlobalTime)
- {
- sun = EventManager.GetCurrentTimeAsSunLindenHour() - 6.0f;
- }
-
- //
- EventManager.TriggerEstateToolsSunUpdate(
- RegionInfo.RegionHandle,
- RegionInfo.EstateSettings.FixedSun,
- RegionInfo.RegionSettings.UseEstateSun,
- sun);
- }
- else
- {
- // Use the Sun Position from the Region Settings
- sun = (float)RegionInfo.RegionSettings.SunPosition - 6.0f;
-
- EventManager.TriggerEstateToolsSunUpdate(
- RegionInfo.RegionHandle,
- RegionInfo.RegionSettings.FixedSun,
- RegionInfo.RegionSettings.UseEstateSun,
- sun);
- }
+ EventManager.TriggerEstateToolsSunUpdate(RegionInfo.RegionHandle);
}
private void HandleReloadEstate(string module, string[] cmd)
--
cgit v1.1
From 9503383887d6af871e843cbcbb141a50df56f551 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 4 Jan 2013 20:34:39 +0000
Subject: Fix llGetLinkKey() to return the last sat avatar as the last link
number.
As per http://wiki.secondlife.com/wiki/LlGetLinkKey
This is done by keeping a scene-object wide list of sitters.
This also fixes bugs in this function where linknums 0 and 1 weren't treated properly if there were sitting avatars on a single prim.
This also fixes a minor race condition for multiple concurrent sitters on a prim with no current sitters by locking on the object-wide list rather than individual sop lists
Addresses http://opensimulator.org/mantis/view.php?id=6477
---
.../Region/Framework/Scenes/SceneObjectGroup.cs | 35 ++++++++--
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 79 +++++++++++-----------
2 files changed, 68 insertions(+), 46 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 35e7c45..15795e5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -647,6 +647,18 @@ namespace OpenSim.Region.Framework.Scenes
/// </remarks>
public UUID FromFolderID { get; set; }
+ /// <summary>
+ /// IDs of all avatars sat on this scene object.
+ /// </summary>
+ /// <remarks>
+ /// We need this so that we can maintain a linkset wide ordering of avatars sat on different parts.
+ /// This must be locked before it is read or written.
+ /// SceneObjectPart sitting avatar add/remove code also locks on this object to avoid race conditions.
+ /// No avatar should appear more than once in this list.
+ /// Do not manipulate this list directly - use the Add/Remove sitting avatar methods on SceneObjectPart.
+ /// </remarks>
+ protected internal List<UUID> m_sittingAvatars = new List<UUID>();
+
#endregion
// ~SceneObjectGroup()
@@ -3564,17 +3576,28 @@ namespace OpenSim.Region.Framework.Scenes
}
/// <summary>
+ /// Get a copy of the list of sitting avatars on all prims of this object.
+ /// </summary>
+ /// <remarks>
+ /// This is sorted by the order in which avatars sat down. If an avatar stands up then all avatars that sat
+ /// down after it move one place down the list.
+ /// </remarks>
+ /// <returns>A list of the sitting avatars. Returns an empty list if there are no sitting avatars.</returns>
+ public List<UUID> GetSittingAvatars()
+ {
+ lock (m_sittingAvatars)
+ return new List<UUID>(m_sittingAvatars);
+ }
+
+ /// <summary>
/// Gets the number of sitting avatars.
/// </summary>
/// <remarks>This applies to all sitting avatars whether there is a sit target set or not.</remarks>
/// <returns></returns>
public int GetSittingAvatarsCount()
{
- int count = 0;
-
- Array.ForEach<SceneObjectPart>(m_parts.GetArray(), p => count += p.GetSittingAvatarsCount());
-
- return count;
+ lock (m_sittingAvatars)
+ return m_sittingAvatars.Count;
}
public override string ToString()
@@ -3583,7 +3606,7 @@ namespace OpenSim.Region.Framework.Scenes
}
#region ISceneObject
-
+
public virtual ISceneObject CloneForNewScene()
{
SceneObjectGroup sog = Copy(false);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 7a97e5f..232861e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1256,7 +1256,7 @@ namespace OpenSim.Region.Framework.Scenes
public UUID SitTargetAvatar { get; set; }
/// <summary>
- /// IDs of all avatars start on this object part.
+ /// IDs of all avatars sat on this part.
/// </summary>
/// <remarks>
/// We need to track this so that we can stop sat upon prims from being attached.
@@ -4504,18 +4504,22 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name='avatarId'></param>
protected internal bool AddSittingAvatar(UUID avatarId)
{
- if (IsSitTargetSet && SitTargetAvatar == UUID.Zero)
- SitTargetAvatar = avatarId;
+ lock (ParentGroup.m_sittingAvatars)
+ {
+ if (IsSitTargetSet && SitTargetAvatar == UUID.Zero)
+ SitTargetAvatar = avatarId;
- HashSet<UUID> sittingAvatars = m_sittingAvatars;
+ if (m_sittingAvatars == null)
+ m_sittingAvatars = new HashSet<UUID>();
- if (sittingAvatars == null)
- sittingAvatars = new HashSet<UUID>();
+ if (m_sittingAvatars.Add(avatarId))
+ {
+ ParentGroup.m_sittingAvatars.Add(avatarId);
- lock (sittingAvatars)
- {
- m_sittingAvatars = sittingAvatars;
- return m_sittingAvatars.Add(avatarId);
+ return true;
+ }
+
+ return false;
}
}
@@ -4529,27 +4533,26 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name='avatarId'></param>
protected internal bool RemoveSittingAvatar(UUID avatarId)
{
- if (SitTargetAvatar == avatarId)
- SitTargetAvatar = UUID.Zero;
-
- HashSet<UUID> sittingAvatars = m_sittingAvatars;
+ lock (ParentGroup.m_sittingAvatars)
+ {
+ if (SitTargetAvatar == avatarId)
+ SitTargetAvatar = UUID.Zero;
- // This can occur under a race condition where another thread
- if (sittingAvatars == null)
- return false;
+ if (m_sittingAvatars == null)
+ return false;
- lock (sittingAvatars)
- {
- if (sittingAvatars.Remove(avatarId))
+ if (m_sittingAvatars.Remove(avatarId))
{
- if (sittingAvatars.Count == 0)
+ if (m_sittingAvatars.Count == 0)
m_sittingAvatars = null;
+ ParentGroup.m_sittingAvatars.Remove(avatarId);
+
return true;
}
- }
- return false;
+ return false;
+ }
}
/// <summary>
@@ -4559,16 +4562,12 @@ namespace OpenSim.Region.Framework.Scenes
/// <returns>A hashset of the sitting avatars. Returns null if there are no sitting avatars.</returns>
public HashSet<UUID> GetSittingAvatars()
{
- HashSet<UUID> sittingAvatars = m_sittingAvatars;
-
- if (sittingAvatars == null)
- {
- return null;
- }
- else
+ lock (ParentGroup.m_sittingAvatars)
{
- lock (sittingAvatars)
- return new HashSet<UUID>(sittingAvatars);
+ if (m_sittingAvatars == null)
+ return null;
+ else
+ return new HashSet<UUID>(m_sittingAvatars);
}
}
@@ -4579,13 +4578,13 @@ namespace OpenSim.Region.Framework.Scenes
/// <returns></returns>
public int GetSittingAvatarsCount()
{
- HashSet<UUID> sittingAvatars = m_sittingAvatars;
-
- if (sittingAvatars == null)
- return 0;
-
- lock (sittingAvatars)
- return sittingAvatars.Count;
+ lock (ParentGroup.m_sittingAvatars)
+ {
+ if (m_sittingAvatars == null)
+ return 0;
+ else
+ return m_sittingAvatars.Count;
+ }
}
}
-}
+}
\ No newline at end of file
--
cgit v1.1