diff options
author | Adam Frisby | 2009-08-16 03:48:16 +1000 |
---|---|---|
committer | Adam Frisby | 2009-08-16 03:48:16 +1000 |
commit | 9090a907692e7deaafd79150bf6482507be86d55 (patch) | |
tree | 487252fb365fde827f77b5599a0cc9cfed20c8ae /OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | |
parent | Deal with possible race in TestAddNeighborRegion in ScenePresenceTests (diff) | |
download | opensim-SC_OLD-9090a907692e7deaafd79150bf6482507be86d55.zip opensim-SC_OLD-9090a907692e7deaafd79150bf6482507be86d55.tar.gz opensim-SC_OLD-9090a907692e7deaafd79150bf6482507be86d55.tar.bz2 opensim-SC_OLD-9090a907692e7deaafd79150bf6482507be86d55.tar.xz |
* Beginnings of a Security Credential system in MRM. This will eventually lead to trusted execution of untrusted MRMs.
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs index bc26389..fa9ef53 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | |||
@@ -42,13 +42,22 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
42 | { | 42 | { |
43 | private readonly Scene m_rootScene; | 43 | private readonly Scene m_rootScene; |
44 | private readonly uint m_localID; | 44 | private readonly uint m_localID; |
45 | private readonly ISecurityCredential m_security; | ||
45 | 46 | ||
47 | [Obsolete("Replace with 'credential' constructor [security]")] | ||
46 | public SOPObject(Scene rootScene, uint localID) | 48 | public SOPObject(Scene rootScene, uint localID) |
47 | { | 49 | { |
48 | m_rootScene = rootScene; | 50 | m_rootScene = rootScene; |
49 | m_localID = localID; | 51 | m_localID = localID; |
50 | } | 52 | } |
51 | 53 | ||
54 | public SOPObject(Scene rootScene, uint localID, ISecurityCredential credential) | ||
55 | { | ||
56 | m_rootScene = rootScene; | ||
57 | m_localID = localID; | ||
58 | m_security = credential; | ||
59 | } | ||
60 | |||
52 | /// <summary> | 61 | /// <summary> |
53 | /// This needs to run very, very quickly. | 62 | /// This needs to run very, very quickly. |
54 | /// It is utilized in nearly every property and method. | 63 | /// It is utilized in nearly every property and method. |