diff options
| author | Diva Canto | 2009-08-16 08:59:58 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-08-16 08:59:58 -0700 |
| commit | 6808b9109e33a111e3655ae214cd7b80ef3346f4 (patch) | |
| tree | 02cddcbd4d6676dfc4840863e498943986b19c47 /OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | |
| parent | Merge branch 'master' into inventory-connector (diff) | |
| parent | * Implements ISecurityCredential member on SPAvatar, SPAvatarAttachment (diff) | |
| download | opensim-SC-6808b9109e33a111e3655ae214cd7b80ef3346f4.zip opensim-SC-6808b9109e33a111e3655ae214cd7b80ef3346f4.tar.gz opensim-SC-6808b9109e33a111e3655ae214cd7b80ef3346f4.tar.bz2 opensim-SC-6808b9109e33a111e3655ae214cd7b80ef3346f4.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into inventory-connector
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs index 0cc7930..6daae29 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | |||
| @@ -169,7 +169,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
| 169 | // UUID should be changed to object owner. | 169 | // UUID should be changed to object owner. |
| 170 | UUID owner = m_scene.RegionInfo.MasterAvatarAssignedUUID; | 170 | UUID owner = m_scene.RegionInfo.MasterAvatarAssignedUUID; |
| 171 | SEUser securityUser = new SEUser(owner, "Name Unassigned"); | 171 | SEUser securityUser = new SEUser(owner, "Name Unassigned"); |
| 172 | SecurityCredential creds = new SecurityCredential(securityUser); | 172 | SecurityCredential creds = new SecurityCredential(securityUser, m_scene); |
| 173 | 173 | ||
| 174 | world = new World(m_scene, creds); | 174 | world = new World(m_scene, creds); |
| 175 | host = new Host(new SOPObject(m_scene, localID, creds), m_scene, new ExtensionHandler(m_extensions), | 175 | host = new Host(new SOPObject(m_scene, localID, creds), m_scene, new ExtensionHandler(m_extensions), |