diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-16 12:15:14 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-16 12:15:14 -0400 |
| commit | acc14c472deeb92e0436ac38d16e3f6e049bc546 (patch) | |
| tree | b31fd0fd1992c1ea6cad2cc1123ab2422953372f /OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | |
| parent | * ShortVersion, another attempt at fixing the test thread death that randomly... (diff) | |
| parent | * Implements ISecurityCredential member on SPAvatar, SPAvatarAttachment (diff) | |
| download | opensim-SC_OLD-acc14c472deeb92e0436ac38d16e3f6e049bc546.zip opensim-SC_OLD-acc14c472deeb92e0436ac38d16e3f6e049bc546.tar.gz opensim-SC_OLD-acc14c472deeb92e0436ac38d16e3f6e049bc546.tar.bz2 opensim-SC_OLD-acc14c472deeb92e0436ac38d16e3f6e049bc546.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
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..6daae29 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, m_scene); | ||
| 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) |