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/MRMModule.cs | |
parent | Deal with possible race in TestAddNeighborRegion in ScenePresenceTests (diff) | |
download | opensim-SC-9090a907692e7deaafd79150bf6482507be86d55.zip opensim-SC-9090a907692e7deaafd79150bf6482507be86d55.tar.gz opensim-SC-9090a907692e7deaafd79150bf6482507be86d55.tar.bz2 opensim-SC-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/MRMModule.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs index 5ed9af3..0cc7930 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | |||
@@ -166,8 +166,14 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
166 | 166 | ||
167 | public void GetGlobalEnvironment(uint localID, out IWorld world, out IHost host) | 167 | public void GetGlobalEnvironment(uint localID, out IWorld world, out IHost host) |
168 | { | 168 | { |
169 | world = new World(m_scene); | 169 | // UUID should be changed to object owner. |
170 | host = new Host(new SOPObject(m_scene, localID), m_scene, new ExtensionHandler(m_extensions), m_microthreads); | 170 | UUID owner = m_scene.RegionInfo.MasterAvatarAssignedUUID; |
171 | SEUser securityUser = new SEUser(owner, "Name Unassigned"); | ||
172 | SecurityCredential creds = new SecurityCredential(securityUser); | ||
173 | |||
174 | world = new World(m_scene, creds); | ||
175 | host = new Host(new SOPObject(m_scene, localID, creds), m_scene, new ExtensionHandler(m_extensions), | ||
176 | m_microthreads); | ||
171 | } | 177 | } |
172 | 178 | ||
173 | public void InitializeMRM(MRMBase mmb, uint localID, UUID itemID) | 179 | public void InitializeMRM(MRMBase mmb, uint localID, UUID itemID) |