aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting
diff options
context:
space:
mode:
authorMelanie2013-03-26 03:40:06 +0000
committerMelanie2013-03-26 03:40:06 +0000
commit5f4c4df227025c6b6156ce8238b56553dca4b5ae (patch)
treeb090b809346ba8e39db1e08ca24933e64dae8ab9 /OpenSim/Region/OptionalModules/Scripting
parentBulletSim: new algorithm for vertical attraction which uses quaternion (diff)
downloadopensim-SC_OLD-5f4c4df227025c6b6156ce8238b56553dca4b5ae.zip
opensim-SC_OLD-5f4c4df227025c6b6156ce8238b56553dca4b5ae.tar.gz
opensim-SC_OLD-5f4c4df227025c6b6156ce8238b56553dca4b5ae.tar.bz2
opensim-SC_OLD-5f4c4df227025c6b6156ce8238b56553dca4b5ae.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}