aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2009-08-16 21:23:39 +1000
committerAdam Frisby2009-08-16 21:23:39 +1000
commit8621dc405e2f0f1ea81baa52ec124d8b362a2abf (patch)
treed5842bb1eb05bfb0045066fc6223c062f05eeec9
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-8621dc405e2f0f1ea81baa52ec124d8b362a2abf.zip
opensim-SC-8621dc405e2f0f1ea81baa52ec124d8b362a2abf.tar.gz
opensim-SC-8621dc405e2f0f1ea81baa52ec124d8b362a2abf.tar.bz2
opensim-SC-8621dc405e2f0f1ea81baa52ec124d8b362a2abf.tar.xz
* Fixes potential NulRef in MRM Security Checks.
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/SecurityCredential.cs5
2 files changed, 4 insertions, 3 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),
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SecurityCredential.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SecurityCredential.cs
index 6e350b9..bc7f6cb 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SecurityCredential.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SecurityCredential.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -38,9 +38,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
38 private readonly ISocialEntity m_owner; 38 private readonly ISocialEntity m_owner;
39 private readonly Scene m_scene; 39 private readonly Scene m_scene;
40 40
41 public SecurityCredential(ISocialEntity m_owner) 41 public SecurityCredential(ISocialEntity m_owner, Scene m_scene)
42 { 42 {
43 this.m_owner = m_owner; 43 this.m_owner = m_owner;
44 this.m_scene = m_scene;
44 } 45 }
45 46
46 public ISocialEntity owner 47 public ISocialEntity owner