From e5dbb652d5118d193de794fb948252195594b344 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 9 May 2012 00:11:10 +0100
Subject: Remove physics actor related race conditions in SetVehicleFlags() and
SetPhysicsAxisRotation()
sop.PhysActor can currently become null at any time.
---
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 4bec2d4..f911ef8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3321,10 +3321,10 @@ namespace OpenSim.Region.Framework.Scenes
public void SetVehicleFlags(int param, bool remove)
{
- if (PhysActor != null)
- {
- PhysActor.VehicleFlags(param, remove);
- }
+ PhysicsActor pa = PhysActor;
+
+ if (pa != null)
+ pa.VehicleFlags(param, remove);
}
public void SetGroup(UUID groupID, IClientAPI client)
@@ -3356,10 +3356,12 @@ namespace OpenSim.Region.Framework.Scenes
public void SetPhysicsAxisRotation()
{
- if (PhysActor != null)
+ PhysicsActor pa = PhysActor;
+
+ if (pa != null)
{
- PhysActor.LockAngularMotion(RotationAxis);
- ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
+ pa.LockAngularMotion(RotationAxis);
+ ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(pa);
}
}
--
cgit v1.1
From 61e99bcdcba5480aa8a2a8b8e2f2b0a66c08e6b4 Mon Sep 17 00:00:00 2001
From: Talun
Date: Tue, 8 May 2012 15:52:25 +0100
Subject: Mantis 6015 new LSL function llGetAgentList.
Details in the lsl wiki
---
.../Shared/Api/Implementation/LSL_Api.cs | 85 ++++++++++++++++++++++
.../ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | 1 +
.../Shared/Api/Runtime/LSL_Constants.cs | 5 ++
.../ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | 5 ++
4 files changed, 96 insertions(+)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index afd943b..5b5cab8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5529,6 +5529,91 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.AddScriptLPS(1);
return "en-us";
}
+ ///
+ /// http://wiki.secondlife.com/wiki/LlGetAgentList
+ /// The list of options is currently not used in SL
+ /// scope is one of:-
+ /// AGENT_LIST_REGION - all in the region
+ /// AGENT_LIST_PARCEL - all in the same parcel as the scripted object
+ /// AGENT_LIST_PARCEL_OWNER - all in any parcel owned by the owner of the
+ /// current parcel.
+ ///
+ public LSL_List llGetAgentList(LSL_Integer scope, LSL_List options)
+ {
+ m_host.AddScriptLPS(1);
+
+ // the constants are 1, 2 and 4 so bits are being set, but you
+ // get an error "INVALID_SCOPE" if it is anything but 1, 2 and 4
+ bool regionWide = scope == ScriptBaseClass.AGENT_LIST_REGION;
+ bool parcelOwned = scope == ScriptBaseClass.AGENT_LIST_PARCEL_OWNER;
+ bool parcel = scope == ScriptBaseClass.AGENT_LIST_PARCEL;
+
+ LSL_List result = new LSL_List();
+
+ if (!regionWide && !parcelOwned && !parcel)
+ {
+ result.Add("INVALID_SCOPE");
+ return result;
+ }
+
+ ILandObject land;
+ Vector3 pos;
+ UUID id = UUID.Zero;
+ if (parcel || parcelOwned)
+ {
+ pos = m_host.ParentGroup.RootPart.GetWorldPosition();
+ land = World.LandChannel.GetLandObject(pos.X, pos.Y);
+ if (land == null)
+ {
+ id = UUID.Zero;
+ }
+ else
+ {
+ if (parcelOwned)
+ {
+ id = land.LandData.OwnerID;
+ }
+ else
+ {
+ id = land.LandData.GlobalID;
+ }
+ }
+ }
+ List presenceIds = new List();
+
+ World.ForEachRootScenePresence(
+ delegate (ScenePresence ssp)
+ {
+ // Gods are not listed in SL
+ if (!ssp.IsDeleted && ssp.GodLevel == 0.0 && !ssp.IsChildAgent)
+ {
+ if (!regionWide)
+ {
+ pos = ssp.AbsolutePosition;
+ land = World.LandChannel.GetLandObject(pos.X, pos.Y);
+ if (land != null)
+ {
+ if (parcelOwned && land.LandData.OwnerID == id ||
+ parcel && land.LandData.GlobalID == id)
+ {
+ result.Add(ssp.UUID.ToString());
+ }
+ }
+ }
+ else
+ {
+ result.Add(ssp.UUID.ToString());
+ }
+ }
+ // Maximum of 100 results
+ if (result.Length > 99)
+ {
+ return;
+ }
+ }
+ );
+ return result;
+ }
public void llAdjustSoundVolume(double volume)
{
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 7a797ac..7f5d1fe 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -109,6 +109,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_Vector llGetAccel();
LSL_Integer llGetAgentInfo(string id);
LSL_String llGetAgentLanguage(string id);
+ LSL_List llGetAgentList(LSL_Integer scope, LSL_List options);
LSL_Vector llGetAgentSize(string id);
LSL_Float llGetAlpha(int face);
LSL_Float llGetAndResetTime();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 2a28542..b6c21e6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -501,6 +501,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public const int OBJECT_STREAMING_COST = 15;
public const int OBJECT_PHYSICS_COST = 16;
+ // for llGetAgentList
+ public const int AGENT_LIST_PARCEL = 1;
+ public const int AGENT_LIST_PARCEL_OWNER = 2;
+ public const int AGENT_LIST_REGION = 4;
+
// Can not be public const?
public static readonly vector ZERO_VECTOR = new vector(0.0, 0.0, 0.0);
public static readonly rotation ZERO_ROTATION = new rotation(0.0, 0.0, 0.0, 1.0);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 80fa530..c0bf29c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -389,6 +389,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_LSL_Functions.llGetAgentLanguage(id);
}
+ public LSL_List llGetAgentList(LSL_Integer scope, LSL_List options)
+ {
+ return m_LSL_Functions.llGetAgentList(scope, options);
+ }
+
public LSL_Vector llGetAgentSize(string id)
{
return m_LSL_Functions.llGetAgentSize(id);
--
cgit v1.1
From 6987aef38dbc4f5c24b6e2cc73601f9a7c5f4431 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 9 May 2012 23:12:30 +0100
Subject: Improve logging on the prim inventory script asset request path for
future use.
This adds name and description of the request handler to http request logging when DebugLevel >= 1
---
.../ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 2 +-
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 13 ++++++++-----
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 4 ++++
3 files changed, 13 insertions(+), 6 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 9791885..6c28e78 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -309,7 +309,7 @@ namespace OpenSim.Region.ClientStack.Linden
m_HostCapsObj.HttpListener.AddStreamHandler(
new BinaryStreamHandler(
- "POST", capsBase + uploaderPath, uploader.uploaderCaps, "BunchOfCaps", null));
+ "POST", capsBase + uploaderPath, uploader.uploaderCaps, "TaskInventoryScriptUpdater", null));
string protocol = "http://";
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index ae5cbff..4d6081c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -11955,21 +11955,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
protected void MakeAssetRequest(TransferRequestPacket transferRequest, UUID taskID)
{
UUID requestID = UUID.Zero;
- if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset)
+ int sourceType = transferRequest.TransferInfo.SourceType;
+
+ if (sourceType == (int)SourceType.Asset)
{
requestID = new UUID(transferRequest.TransferInfo.Params, 0);
}
- else if (transferRequest.TransferInfo.SourceType == (int)SourceType.SimInventoryItem)
+ else if (sourceType == (int)SourceType.SimInventoryItem)
{
requestID = new UUID(transferRequest.TransferInfo.Params, 80);
}
- else if (transferRequest.TransferInfo.SourceType == (int)SourceType.SimEstate)
+ else if (sourceType == (int)SourceType.SimEstate)
{
requestID = taskID;
}
-
-// m_log.DebugFormat("[CLIENT]: {0} requesting asset {1}", Name, requestID);
+// m_log.DebugFormat(
+// "[LLCLIENTVIEW]: Received transfer request for {0} in {1} type {2} by {3}",
+// requestID, taskID, (SourceType)sourceType, Name);
m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived);
}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 816d3b6..8a26df1 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -300,6 +300,10 @@ namespace OpenSim.Region.Framework.Scenes
AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)AssetType.LSLText, data, remoteClient.AgentId);
AssetService.Store(asset);
+// m_log.DebugFormat(
+// "[PRIM INVENTORY]: Stored asset {0} when updating item {1} in prim {2} for {3}",
+// asset.ID, item.Name, part.Name, remoteClient.Name);
+
if (isScriptRunning)
{
part.Inventory.RemoveScriptInstance(item.ItemID, false);
--
cgit v1.1
From de44734fe9a0b31cd8cb78c0f58e61a35fe2a259 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Thu, 10 May 2012 09:08:40 -0700
Subject: Saving estate state is really slow (relatively) and it gets
completely rewritten every time a region starts up. This makes the data write
only when the data was not already read from the database.
There is a still a major race condition whenever two regions
share the same estate data, but at least it won't be triggered
on startup.
---
OpenSim/Region/Application/OpenSim.cs | 5 +++--
OpenSim/Region/Application/OpenSimBase.cs | 12 +++++++-----
2 files changed, 10 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 4ec64ee..6796f2b 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -618,10 +618,11 @@ namespace OpenSim
return;
}
- PopulateRegionEstateInfo(regInfo);
+ bool changed = PopulateRegionEstateInfo(regInfo);
IScene scene;
CreateRegion(regInfo, true, out scene);
- regInfo.EstateSettings.Save();
+ if (changed)
+ regInfo.EstateSettings.Save();
}
///
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 79259d8..045e8d2 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -977,13 +977,13 @@ namespace OpenSim
/// Load the estate information for the provided RegionInfo object.
///
///
- public void PopulateRegionEstateInfo(RegionInfo regInfo)
+ public bool PopulateRegionEstateInfo(RegionInfo regInfo)
{
if (EstateDataService != null)
regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, false);
if (regInfo.EstateSettings.EstateID != 0)
- return;
+ return false; // estate info in the database did not change
m_log.WarnFormat("[ESTATE] Region {0} is not part of an estate.", regInfo.RegionName);
@@ -1018,7 +1018,7 @@ namespace OpenSim
}
if (defaultEstateJoined)
- return;
+ return true; // need to update the database
else
m_log.ErrorFormat(
"[OPENSIM BASE]: Joining default estate {0} failed", defaultEstateName);
@@ -1080,8 +1080,10 @@ namespace OpenSim
MainConsole.Instance.Output("Joining the estate failed. Please try again.");
}
}
- }
- }
+ }
+
+ return true; // need to update the database
+ }
}
public class OpenSimConfigSource
--
cgit v1.1