Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

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
     {
         private readonly Scene m_rootScene;
         private readonly uint m_localID;
+        private readonly ISecurityCredential m_security;
 
+        [Obsolete("Replace with 'credential' constructor [security]")]
         public SOPObject(Scene rootScene, uint localID)
         {
             m_rootScene = rootScene;
             m_localID = localID;
         }
 
+        public SOPObject(Scene rootScene, uint localID, ISecurityCredential credential)
+        {
+            m_rootScene = rootScene;
+            m_localID = localID;
+            m_security = credential;
+        }
+
         /// <summary>
         /// This needs to run very, very quickly.
         /// It is utilized in nearly every property and method.