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

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

1 files changed, 11 insertions, 0 deletions

diff --git a/OpenSim/Services/Interfaces/IUserAccountService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs
index 20414f6..cadf297 100644
--- a/OpenSim/Services/Interfaces/IUserAccountService.cs
+++ b/OpenSim/Services/Interfaces/IUserAccountService.cs
@@ -44,6 +44,17 @@ namespace OpenSim.Services.Interfaces
             PrincipalID = principalID;
         }
 
+        public UserAccount(UUID scopeID, string firstName, string lastName, string email)
+        {
+            PrincipalID = UUID.Random();
+            ScopeID = scopeID;
+            FirstName = firstName;
+            LastName = lastName;
+            Email = email;
+            ServiceURLs = new Dictionary<string, object>();
+            Created = Util.UnixTimeSinceEpoch();
+        }
+
         public UserAccount(UUID scopeID, UUID principalID, string firstName, string lastName, string email)
         {
             PrincipalID = principalID;