Merge branch 'master' into careminster

This commit is contained in:
Melanie
2010-01-10 04:16:06 +00:00
14 changed files with 220 additions and 215 deletions

View File

@@ -388,12 +388,6 @@ namespace OpenSim.Framework.Communications.Tests
}
}
#region ILoginRegionsConnector Members
public bool RegionLoginsEnabled
{
get { return true; }
}
public void LogOffUserFromGrid(ulong regionHandle, OpenMetaverse.UUID AvatarID, OpenMetaverse.UUID RegionSecret, string message)
{
}
@@ -454,8 +448,6 @@ namespace OpenSim.Framework.Communications.Tests
return null;
}
#endregion
}
}
}
}

View File

@@ -32,7 +32,6 @@ namespace OpenSim.Framework
{
public interface ILoginServiceToRegionsConnector
{
bool RegionLoginsEnabled { get; }
void LogOffUserFromGrid(ulong regionHandle, UUID AvatarID, UUID RegionSecret, string message);
bool NewUserConnection(ulong regionHandle, AgentCircuitData agent, out string reason);
RegionInfo RequestClosestRegion(string region);