From 81aeecc90723658187668baa49bd168b7b333afb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 24 Oct 2012 04:10:22 +0100
Subject: Allow "show object", "show part", "dump object" and "delete object"
to accept a local ID as well as a UUID.
This means that the sub-commands are now id rather than uuid, e.g. show object id
---
OpenSim/Region/Framework/Scenes/Scene.cs | 13 ++++++++++++-
OpenSim/Region/Framework/Scenes/SceneGraph.cs | 24 ++++++++++++++++++++++++
2 files changed, 36 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 5f45529..532598a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4688,13 +4688,24 @@ namespace OpenSim.Region.Framework.Scenes
/// Get a group via its UUID
///
///
- /// null if no group with that name exists
+ /// null if no group with that id exists
public SceneObjectGroup GetSceneObjectGroup(UUID fullID)
{
return m_sceneGraph.GetSceneObjectGroup(fullID);
}
///
+ /// Get a group via its local ID
+ ///
+ /// This will only return a group if the local ID matches a root part
+ ///
+ /// null if no group with that id exists
+ public SceneObjectGroup GetSceneObjectGroup(uint localID)
+ {
+ return m_sceneGraph.GetSceneObjectGroup(localID);
+ }
+
+ ///
/// Get a group by name from the scene (will return the first
/// found, if there are more than one prim with the same name)
///
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 209a770..a4383fd 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -983,6 +983,30 @@ namespace OpenSim.Region.Framework.Scenes
}
///
+ /// Get a group in the scene
+ ///
+ ///
+ /// This will only return a group if the local ID matches the root part, not other parts.
+ ///
+ /// Local id of the root part of the group
+ /// null if no such group was found
+ protected internal SceneObjectGroup GetSceneObjectGroup(uint localID)
+ {
+ lock (SceneObjectGroupsByLocalPartID)
+ {
+ if (SceneObjectGroupsByLocalPartID.ContainsKey(localID))
+ {
+ SceneObjectGroup so = SceneObjectGroupsByLocalPartID[localID];
+
+ if (so.LocalId == localID)
+ return so;
+ }
+ }
+
+ return null;
+ }
+
+ ///
/// Get a group by name from the scene (will return the first
/// found, if there are more than one prim with the same name)
///
--
cgit v1.1
From d9aaf51561ea7bb2ee030c648611a5281f21ec49 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 25 Oct 2012 02:52:20 +0100
Subject: When scripts generate expected exceptions (e.g. due to checked bad
parameter) throw ScriptException instead of just a plain old exception.
This is to make it easier to distinguish these exceptions from unexpected OpenSimulator problems internally and in regression tests.
No functional changes.
---
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 6e53951..99bf72a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -38,7 +38,6 @@ namespace OpenSim.Region.Framework.Scenes
{
public partial class Scene
{
-
protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName,
UUID fromID, UUID targetID, bool fromAgent, bool broadcast)
{
@@ -66,6 +65,10 @@ namespace OpenSim.Region.Framework.Scenes
args.From = fromName;
args.TargetUUID = targetID;
+// m_log.DebugFormat(
+// "[SCENE]: Sending message {0} on channel {1}, type {2} from {3}, broadcast {4}",
+// args.Message.Replace("\n", "\\n"), args.Channel, args.Type, fromName, broadcast);
+
if (broadcast)
EventManager.TriggerOnChatBroadcast(this, args);
else
--
cgit v1.1
From c13a99dc5cc82efac5497dab27dcb6b0d9865cea Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 25 Oct 2012 03:26:12 +0100
Subject: Fix script error messages not showing up in viewer 3 and associated
viewers.
Viewer 3 will discard such a message if the chat message owner does not match the avatar.
We were filling the ownerID with the primID, so this never matched, hence viewer 3 did not see any script error messages.
This commit fills the ownerID in with the prim ownerID so the script owner will receive script error messages.
This does not affect viewer 1 and associated viewers which continue to process script errors as normal.
---
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 12 ++++++++++++
1 file changed, 12 insertions(+)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 99bf72a..df43271 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -38,6 +38,18 @@ namespace OpenSim.Region.Framework.Scenes
{
public partial class Scene
{
+ ///
+ /// Send chat to listeners.
+ ///
+ ///
+ /// /param>
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName,
UUID fromID, UUID targetID, bool fromAgent, bool broadcast)
{
--
cgit v1.1
From fa484c3494a7190b4d7526094347be74d091e125 Mon Sep 17 00:00:00 2001
From: nebadon
Date: Thu, 25 Oct 2012 11:31:25 -0700
Subject: Fix for Mantis 0006376: Avatar no longer show Walking animation when
any AO hud is loaded. Thank you tglion
---
OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
index ad421ee..9ed4f47 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
{
if (m_defaultAnimation.AnimID == animID)
{
- m_defaultAnimation = new OpenSim.Framework.Animation(UUID.Zero, 1, UUID.Zero);
+ m_defaultAnimation = new OpenSim.Framework.Animation(animID, 1, UUID.Zero);
}
else if (HasAnimation(animID))
{
--
cgit v1.1
From 22e216fd123744f6c87024fc18f3c9b306777fe2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 25 Oct 2012 22:55:29 +0100
Subject: In Scene.Close(), dispose of the physics scene after base.Close()
since script events can still access Physics scene until the script engine
shuts down (triggered off base.Close())
XEngine listeners to EventManager.OnShutdown which is triggered from base.Close().
Possibly it could listen for the earlier OnSceneShuttingDown instead, but the easier solution right now is to relocate disposal of the physics scene.
This bug has existed since c150320 (Thu Jul 26 15:27:18 2012) and was in 0.7.4
---
OpenSim/Region/Framework/Scenes/Scene.cs | 14 ++++++++------
OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs | 17 +++++++++++++++++
2 files changed, 25 insertions(+), 6 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 532598a..d48dc11 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1310,6 +1310,14 @@ namespace OpenSim.Region.Framework.Scenes
m_sceneGraph.Close();
+ if (!GridService.DeregisterRegion(RegionInfo.RegionID))
+ m_log.WarnFormat("[SCENE]: Deregister from grid failed for region {0}", Name);
+
+ base.Close();
+
+ // XEngine currently listens to the EventManager.OnShutdown event to trigger script stop and persistence.
+ // Therefore. we must dispose of the PhysicsScene after this to prevent a window where script code can
+ // attempt to reference a null or disposed physics scene.
if (PhysicsScene != null)
{
PhysicsScene phys = PhysicsScene;
@@ -1318,12 +1326,6 @@ namespace OpenSim.Region.Framework.Scenes
phys.Dispose();
phys = null;
}
-
- if (!GridService.DeregisterRegion(RegionInfo.RegionID))
- m_log.WarnFormat("[SCENE]: Deregister from grid failed for region {0}", Name);
-
- // call the base class Close method.
- base.Close();
}
///
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
index d722a09..ac3da1e 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
@@ -65,5 +65,22 @@ namespace OpenSim.Region.Framework.Scenes.Tests
Assert.That(scene.Frame, Is.EqualTo(1));
}
+
+ [Test]
+ public void TestShutdownScene()
+ {
+ TestHelpers.InMethod();
+
+ Scene scene = new SceneHelpers().SetupScene();
+ scene.Close();
+
+ Assert.That(scene.ShuttingDown, Is.True);
+ Assert.That(scene.Active, Is.False);
+
+ // Trying to update a shutdown scene should result in no update
+ scene.Update(1);
+
+ Assert.That(scene.Frame, Is.EqualTo(0));
+ }
}
}
\ No newline at end of file
--
cgit v1.1
From b4923da3348b05e4b85f842210bea4e6f08b4cef Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Mon, 13 Aug 2012 16:02:50 +0300
Subject: Changed "course" to "coarse" in several places
---
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 1222ac6..b6d0a3b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.Framework.Scenes
public ScriptControlled eventControls;
}
- public delegate void SendCourseLocationsMethod(UUID scene, ScenePresence presence, List coarseLocations, List avatarUUIDs);
+ public delegate void SendCoarseLocationsMethod(UUID scene, ScenePresence presence, List coarseLocations, List avatarUUIDs);
public class ScenePresence : EntityBase, IScenePresence
{
@@ -186,7 +186,7 @@ namespace OpenSim.Region.Framework.Scenes
///
public bool SitGround { get; private set; }
- private SendCourseLocationsMethod m_sendCourseLocationsMethod;
+ private SendCoarseLocationsMethod m_sendCoarseLocationsMethod;
//private Vector3 m_requestedSitOffset = new Vector3();
@@ -695,7 +695,7 @@ namespace OpenSim.Region.Framework.Scenes
AttachmentsSyncLock = new Object();
AllowMovement = true;
IsChildAgent = true;
- m_sendCourseLocationsMethod = SendCoarseLocationsDefault;
+ m_sendCoarseLocationsMethod = SendCoarseLocationsDefault;
Animator = new ScenePresenceAnimator(this);
PresenceType = type;
DrawDistance = world.DefaultDrawDistance;
@@ -2432,17 +2432,17 @@ namespace OpenSim.Region.Framework.Scenes
public void SendCoarseLocations(List coarseLocations, List avatarUUIDs)
{
- SendCourseLocationsMethod d = m_sendCourseLocationsMethod;
+ SendCoarseLocationsMethod d = m_sendCoarseLocationsMethod;
if (d != null)
{
d.Invoke(m_scene.RegionInfo.originRegionID, this, coarseLocations, avatarUUIDs);
}
}
- public void SetSendCourseLocationMethod(SendCourseLocationsMethod d)
+ public void SetSendCoarseLocationMethod(SendCoarseLocationsMethod d)
{
if (d != null)
- m_sendCourseLocationsMethod = d;
+ m_sendCoarseLocationsMethod = d;
}
public void SendCoarseLocationsDefault(UUID sceneId, ScenePresence p, List coarseLocations, List avatarUUIDs)
@@ -2646,7 +2646,7 @@ namespace OpenSim.Region.Framework.Scenes
#region Significant Movement Method
///
- /// This checks for a significant movement and sends a courselocationchange update
+ /// This checks for a significant movement and sends a coarselocationchange update
///
protected void CheckForSignificantMovement()
{
--
cgit v1.1
From dc17cee044e0d2d17e8152eb31829c3ad5a99359 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 25 Oct 2012 23:47:13 +0100
Subject: minor: if a scene is already shutting down on Scene.Close(), warn and
exit instead of attempting to run another shutdown concurrently.
Thanks to Oren Hurvitz for this change.
---
OpenSim/Region/Framework/Scenes/Scene.cs | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d48dc11..0f39671 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1267,6 +1267,12 @@ namespace OpenSim.Region.Framework.Scenes
// This is the method that shuts down the scene.
public override void Close()
{
+ if (m_shuttingDown)
+ {
+ m_log.WarnFormat("[SCENE]: Ignoring close request because already closing {0}", Name);
+ return;
+ }
+
m_log.InfoFormat("[SCENE]: Closing down the single simulator: {0}", RegionInfo.RegionName);
StatsReporter.Close();
--
cgit v1.1
From 2fb89b5aac0369e126234a8189d676d904d0ae33 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 26 Oct 2012 01:15:16 +0100
Subject: Comment out InventoryTransferModule.NeedSceneCacheClear() and
invocations since the call itself does nothing and the return value is
ignored by all callers.
This is a very old method (+4 years) so is probably confusing code cruft.
---
OpenSim/Region/Framework/Scenes/Scene.cs | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0f39671..9c61fe7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3435,9 +3435,10 @@ namespace OpenSim.Region.Framework.Scenes
if (closeChildAgents && CapsModule != null)
CapsModule.RemoveCaps(agentID);
- // REFACTORING PROBLEM -- well not really a problem, but just to point out that whatever
- // this method is doing is HORRIBLE!!!
- avatar.Scene.NeedSceneCacheClear(avatar.UUID);
+// // REFACTORING PROBLEM -- well not really a problem, but just to point out that whatever
+// // this method is doing is HORRIBLE!!!
+ // Commented pending deletion since this method no longer appears to do anything at all
+// avatar.Scene.NeedSceneCacheClear(avatar.UUID);
if (closeChildAgents && !isChildAgent)
{
@@ -4873,14 +4874,15 @@ namespace OpenSim.Region.Framework.Scenes
client.SendRegionHandle(regionID, handle);
}
- public bool NeedSceneCacheClear(UUID agentID)
- {
- IInventoryTransferModule inv = RequestModuleInterface();
- if (inv == null)
- return true;
-
- return inv.NeedSceneCacheClear(agentID, this);
- }
+// Commented pending deletion since this method no longer appears to do anything at all
+// public bool NeedSceneCacheClear(UUID agentID)
+// {
+// IInventoryTransferModule inv = RequestModuleInterface();
+// if (inv == null)
+// return true;
+//
+// return inv.NeedSceneCacheClear(agentID, this);
+// }
public void CleanTempObjects()
{
--
cgit v1.1