OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' into avination

avinationmerge
Melanie 2012-08-24 23:53:14 +02:00
parent 6d48dbf8ca f9a318380b
commit f1a71f544b
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
View File

@ -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;
}

5
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -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)

1
OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
View File

@ -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);
}

1
OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
View File

@ -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);
}

5
OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
View File

@ -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;
}
}

1
OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
View File

@ -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);
}