Merge branch 'ubitwork' into avination

6 files changed, 9 insertions, 5 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
index 25ee4c6..d809ac2 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
@@ -140,6 +140,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication
         public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID)
         {
             // Not implemented at the regions
+            realID = UUID.Zero;
             return string.Empty; 
         }
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 3e1b43e..d8ef772 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7785,10 +7785,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         remaining = SetPrimParams((ScenePresence)part, rules);
                 }
 
-                while((object)remaining != null && remaining.Length > 2)
+                while ((object)remaining != null && remaining.Length > 2)
                 {
                     linknumber = remaining.GetLSLIntegerItem(0);
-                    rules = remaining.GetSublist(1,-1);
+                    rules = remaining.GetSublist(1, -1);
                     parts.Clear();
                     prims = GetLinkParts(linknumber);
                     avatars = GetLinkAvatars(linknumber);
@@ -7797,6 +7797,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     foreach (ScenePresence p in avatars)
                         parts.Add(p);
 
+                    remaining = null;
                     foreach (object part in parts)
                     {
                         if (part is SceneObjectPart)
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
index 9d12d47..a069838 100644
--- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
@@ -65,7 +65,6 @@ namespace OpenSim.Services.AuthenticationService
         public string Authenticate(UUID principalID, string password, int lifetime)
         {
             UUID realID;
-
             return Authenticate(principalID, password, lifetime, out realID);
         }
 
diff --git a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
index 47b4fa6..1510168 100644
--- a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
@@ -63,7 +63,6 @@ namespace OpenSim.Services.AuthenticationService
         public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID)
         {
             realID = UUID.Zero;
-
             return Authenticate(principalID, password, lifetime);
         }
 
diff --git a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
index 7fbf36d..bbc8470 100644
--- a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
@@ -64,6 +64,7 @@ namespace OpenSim.Services.AuthenticationService
         {
             AuthenticationData data = m_Database.Get(principalID);
             string result = String.Empty;
+            realID = UUID.Zero;
             if (data != null && data.Data != null)
             {
                 if (data.Data.ContainsKey("webLoginKey"))
@@ -85,7 +86,7 @@ namespace OpenSim.Services.AuthenticationService
                     }
                 }
 
-                realID = UUID.Zero;
+              
 
                 if (result == string.Empty)
                 {
@@ -96,6 +97,8 @@ namespace OpenSim.Services.AuthenticationService
             {
                 m_log.DebugFormat("[AUTH SERVICE]: PrincipalID {0} or its data not found", principalID);
             }
+            
+            
             return result;
         }
     }
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
index 331d485..ffae0da 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
@@ -104,6 +104,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID)
         {
+            realID = UUID.Zero;
             return Authenticate(principalID, password, lifetime);
         }