Some conflict, probably due to line ending at LocalGridServiceConnector.cs. Just commit the difference to move on.

dsg
Huaiyu (Kitty) Liu 2011-02-15 15:07:43 -08:00
parent 1837778cf9
commit e66668ad7e
1 changed files with 1 additions and 1 deletions

View File

@ -283,7 +283,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
return m_GridService.LookupQuark(locX, locY, actorType);
}
public bool CleanUpEndpoint(string syncServerID)
{
{
return m_GridService.CleanUpEndpoint(syncServerID);
}
#endregion SYNC SERVER