From db3f0a37485bfecc831104d9dbcd397404364e79 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 16 Aug 2012 15:26:16 +0100
Subject: fix vs2010 build

---
 .../Authentication/LocalAuthenticationServiceConnector.cs                | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Region')

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; 
         }
 
-- 
cgit v1.1


From f9a318380be0ddcce3c8bbc09c13bfb0206674f1 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 16 Aug 2012 22:14:56 +0100
Subject:  let setLinkPrimParams terminate even if there are no more parts.

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d6aafaf..1433cc9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7778,10 +7778,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);
@@ -7790,6 +7790,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)
-- 
cgit v1.1