aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting
diff options
context:
space:
mode:
authorMelanie2013-03-24 18:56:28 +0100
committerMelanie2013-03-24 18:56:28 +0100
commitc341664c1b8ccf3bd7b81795b900b971a15ff318 (patch)
tree7d88b1b0f028e798f49c729c1626d06f96d2ba35 /OpenSim/Region/OptionalModules/Scripting
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
downloadopensim-SC_OLD-c341664c1b8ccf3bd7b81795b900b971a15ff318.zip
opensim-SC_OLD-c341664c1b8ccf3bd7b81795b900b971a15ff318.tar.gz
opensim-SC_OLD-c341664c1b8ccf3bd7b81795b900b971a15ff318.tar.bz2
opensim-SC_OLD-c341664c1b8ccf3bd7b81795b900b971a15ff318.tar.xz
Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
index 4a754a9..1bb5aee 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
@@ -42,6 +42,7 @@ using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.Framework.Scenes.Scripting; 42using OpenSim.Region.Framework.Scenes.Scripting;
43using System.Collections.Generic; 43using System.Collections.Generic;
44using System.Text.RegularExpressions; 44using System.Text.RegularExpressions;
45using PermissionMask = OpenSim.Framework.PermissionMask;
45 46
46namespace OpenSim.Region.OptionalModules.Scripting.JsonStore 47namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
47{ 48{
@@ -643,4 +644,4 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
643 } 644 }
644 645
645 } 646 }
646} \ No newline at end of file 647}