From b9e2606c2ff820369659940e4aafbcb55390794a Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sun, 15 Jan 2017 16:15:40 +0000
Subject: add code for fixing effective permitions. This is a test, and
currently too slow for prodution. just finding our way home
---
OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'OpenSim/Region/Framework/Interfaces')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 0c4017e..2af6ff0 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -278,6 +278,11 @@ namespace OpenSim.Region.Framework.Interfaces
///
void ProcessInventoryBackup(ISimulationDataService datastore);
+ void AggregateEveryOnePerms(ref uint current);
+ void AggregateGroupOrEveryonePerms(ref uint current);
+ void AggregateGroupPerms(ref uint current);
+ void AggregateOwnerPerms(ref uint current);
+
uint MaskEffectivePermissions();
void ApplyNextOwnerPermissions();
--
cgit v1.1
From 733072b6a371f52d5c13f61d4b2a145a370370f5 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 16 Jan 2017 19:01:41 +0000
Subject: chance new effective permissions code to ease aggregation on demand(
ie on changes). But still doing full aggregation on checks, so still heavy
---
OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
(limited to 'OpenSim/Region/Framework/Interfaces')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 2af6ff0..e7c2428 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -278,10 +278,7 @@ namespace OpenSim.Region.Framework.Interfaces
///
void ProcessInventoryBackup(ISimulationDataService datastore);
- void AggregateEveryOnePerms(ref uint current);
- void AggregateGroupOrEveryonePerms(ref uint current);
- void AggregateGroupPerms(ref uint current);
- void AggregateOwnerPerms(ref uint current);
+ void AggregateInnerPerms(ref uint owner, ref uint group, ref uint everyone);
uint MaskEffectivePermissions();
--
cgit v1.1
From 75915bd0f3be487a0fa05e4a91d46b23b488ce82 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 31 Mar 2017 13:46:01 +0100
Subject: Add the ability to post to and act uponconfiguration in etcd
Etcd is a distributed, highly available name-value store that is
the basis of many clustered applications. However, it can also be
run on a standalone machine. Using etcd allows live monitoring
and possibly changing configuration while the sim is running.
---
OpenSim/Region/Framework/Interfaces/IEtcdModule.cs | 37 ++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 OpenSim/Region/Framework/Interfaces/IEtcdModule.cs
(limited to 'OpenSim/Region/Framework/Interfaces')
diff --git a/OpenSim/Region/Framework/Interfaces/IEtcdModule.cs b/OpenSim/Region/Framework/Interfaces/IEtcdModule.cs
new file mode 100644
index 0000000..123cb67
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IEtcdModule.cs
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+
+public interface IEtcdModule
+{
+ bool Store(string k, string v);
+ bool Store(string k, string v, int ttl);
+ string Get(string k);
+ void Watch(string k, Action callback);
+ void Delete(string k);
+}
--
cgit v1.1
From b52f7b920342b7ea3e0294eae054e7520801e339 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sat, 15 Apr 2017 10:56:46 +0100
Subject: missing file and remove warnings
---
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | 2 ++
1 file changed, 2 insertions(+)
(limited to 'OpenSim/Region/Framework/Interfaces')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 9585082..1b690ba 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -102,6 +102,8 @@ namespace OpenSim.Region.Framework.Interfaces
ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, EntityTransferContext ctx);
+ bool CrossAgentCreateFarChild(ScenePresence agent, GridRegion neighbourRegion, Vector3 pos, EntityTransferContext ctx);
+
bool HandleIncomingSceneObject(SceneObjectGroup so, Vector3 newPosition);
}
--
cgit v1.1