Bug fix in GridServer
parent
06bd7ea167
commit
e707d307e5
|
@ -83,6 +83,7 @@ namespace OpenSim
|
|||
}
|
||||
else
|
||||
{
|
||||
//Console.WriteLine("session authorised");
|
||||
//is authorised
|
||||
string first = "",last ="";
|
||||
LLUUID baseFolder = null, inventoryFolder =null;
|
||||
|
|
|
@ -107,7 +107,6 @@ namespace OpenSim
|
|||
{
|
||||
//this.time++;
|
||||
this._scene.Update();
|
||||
// this._assetManager.DoWork( time );
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -119,6 +118,8 @@ namespace OpenSim
|
|||
|
||||
public BackboneServers()
|
||||
{
|
||||
//These should be changed depending on if we are running as a local sandbox
|
||||
// or connected to a grid.
|
||||
this.GridServer = (IGridServer) new GridServer();
|
||||
this.UserServer =(IUserServer) new UserServer();
|
||||
this.AssetServer =(IAssetServer) new AssetServer();
|
||||
|
|
|
@ -35,7 +35,7 @@ namespace OpenSim
|
|||
/// Handles connection to Grid Servers.
|
||||
/// also Sim to Sim connections?
|
||||
/// </summary>
|
||||
public class GridServer //:IGridServer
|
||||
public class GridServer :IGridServer
|
||||
{
|
||||
public List<Logon> Sessions = new List<Logon>(); //should change to something other than logon classes?
|
||||
|
||||
|
@ -44,6 +44,10 @@ namespace OpenSim
|
|||
Sessions = new List<Logon>();
|
||||
}
|
||||
|
||||
public bool RequestConnection(RegionInfo myRegion)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
public AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode)
|
||||
{
|
||||
//For Grid use:
|
||||
|
@ -68,6 +72,16 @@ namespace OpenSim
|
|||
return(user);
|
||||
}
|
||||
|
||||
public UUIDBlock RequestUUIDBlock()
|
||||
{
|
||||
UUIDBlock uuidBlock = new UUIDBlock();
|
||||
return(uuidBlock);
|
||||
}
|
||||
|
||||
public RegionInfo[] RequestNeighbours()
|
||||
{
|
||||
return(null);
|
||||
}
|
||||
/// <summary>
|
||||
/// used by the local login server to inform us of new sessions
|
||||
/// </summary>
|
||||
|
|
Loading…
Reference in New Issue