diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 5 |
2 files changed, 4 insertions, 2 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 | |||
140 | public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID) | 140 | public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID) |
141 | { | 141 | { |
142 | // Not implemented at the regions | 142 | // Not implemented at the regions |
143 | realID = UUID.Zero; | ||
143 | return string.Empty; | 144 | return string.Empty; |
144 | } | 145 | } |
145 | 146 | ||
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 | |||
7778 | remaining = SetPrimParams((ScenePresence)part, rules); | 7778 | remaining = SetPrimParams((ScenePresence)part, rules); |
7779 | } | 7779 | } |
7780 | 7780 | ||
7781 | while((object)remaining != null && remaining.Length > 2) | 7781 | while ((object)remaining != null && remaining.Length > 2) |
7782 | { | 7782 | { |
7783 | linknumber = remaining.GetLSLIntegerItem(0); | 7783 | linknumber = remaining.GetLSLIntegerItem(0); |
7784 | rules = remaining.GetSublist(1,-1); | 7784 | rules = remaining.GetSublist(1, -1); |
7785 | parts.Clear(); | 7785 | parts.Clear(); |
7786 | prims = GetLinkParts(linknumber); | 7786 | prims = GetLinkParts(linknumber); |
7787 | avatars = GetLinkAvatars(linknumber); | 7787 | avatars = GetLinkAvatars(linknumber); |
@@ -7790,6 +7790,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7790 | foreach (ScenePresence p in avatars) | 7790 | foreach (ScenePresence p in avatars) |
7791 | parts.Add(p); | 7791 | parts.Add(p); |
7792 | 7792 | ||
7793 | remaining = null; | ||
7793 | foreach (object part in parts) | 7794 | foreach (object part in parts) |
7794 | { | 7795 | { |
7795 | if (part is SceneObjectPart) | 7796 | if (part is SceneObjectPart) |