Physics Plugin system is now working (although there is only currently plugin for basic movements)
parent
d69c951ed0
commit
d9e3768ba9
|
@ -68,7 +68,7 @@ namespace OpenSim
|
||||||
this.RegionLocY = 996;
|
this.RegionLocY = 996;
|
||||||
this.RegionHandle = Helpers.UIntsToLong((RegionLocX*256), (RegionLocY*256));
|
this.RegionHandle = Helpers.UIntsToLong((RegionLocX*256), (RegionLocY*256));
|
||||||
this.IPListenPort = 9000;
|
this.IPListenPort = 9000;
|
||||||
this.IPListenAddr = "127.0.0.1";
|
this.IPListenAddr = "4.78.190.75";
|
||||||
this.AssetURL = "http://www.osgrid.org/ogs/assetserver/";
|
this.AssetURL = "http://www.osgrid.org/ogs/assetserver/";
|
||||||
this.AssetSendKey = "1234";
|
this.AssetSendKey = "1234";
|
||||||
this.GridURL = "http://www.osgrid.org/ogs/gridserver/";
|
this.GridURL = "http://www.osgrid.org/ogs/gridserver/";
|
||||||
|
|
|
@ -79,7 +79,7 @@ namespace OpenSim
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AssetLoader() {
|
public void AssetLoader() {
|
||||||
/*
|
|
||||||
Console.WriteLine("OpenSimClient.cs:AssetLoader() - Starting new thread");
|
Console.WriteLine("OpenSimClient.cs:AssetLoader() - Starting new thread");
|
||||||
TransferRequestPacket reqPacket = AssetRequests.Dequeue();
|
TransferRequestPacket reqPacket = AssetRequests.Dequeue();
|
||||||
Console.WriteLine("OpenSimClient.cs:AssetLoader() - Got a request, processing it");
|
Console.WriteLine("OpenSimClient.cs:AssetLoader() - Got a request, processing it");
|
||||||
|
@ -128,7 +128,7 @@ namespace OpenSim
|
||||||
OutPacket(TransferPacket);
|
OutPacket(TransferPacket);
|
||||||
}
|
}
|
||||||
AssetResponse.Close();
|
AssetResponse.Close();
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ProcessInPacket(Packet Pack) {
|
public void ProcessInPacket(Packet Pack) {
|
||||||
|
@ -389,7 +389,7 @@ namespace OpenSim
|
||||||
}
|
}
|
||||||
|
|
||||||
private void AuthUser() {
|
private void AuthUser() {
|
||||||
/*Console.WriteLine("OpenSimClient.cs:AuthUser() - Authenticating new user request with grid");
|
Console.WriteLine("OpenSimClient.cs:AuthUser() - Authenticating new user request with grid");
|
||||||
WebRequest CheckSession = WebRequest.Create(OpenSim_Main.cfg.GridURL + "/usersessions/" + OpenSim_Main.cfg.GridSendKey + "/" + cirpack.CircuitCode.ID.ToString() + "/" + cirpack.CircuitCode.Code.ToString() + "/exists");
|
WebRequest CheckSession = WebRequest.Create(OpenSim_Main.cfg.GridURL + "/usersessions/" + OpenSim_Main.cfg.GridSendKey + "/" + cirpack.CircuitCode.ID.ToString() + "/" + cirpack.CircuitCode.Code.ToString() + "/exists");
|
||||||
WebResponse GridResponse = CheckSession.GetResponse();
|
WebResponse GridResponse = CheckSession.GetResponse();
|
||||||
StreamReader sr = new StreamReader(GridResponse.GetResponseStream());
|
StreamReader sr = new StreamReader(GridResponse.GetResponseStream());
|
||||||
|
@ -406,12 +406,14 @@ namespace OpenSim
|
||||||
} else { // Invalid
|
} else { // Invalid
|
||||||
Console.WriteLine("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
|
Console.WriteLine("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
|
||||||
ClientThread.Abort();
|
ClientThread.Abort();
|
||||||
}*/
|
}
|
||||||
this.AgentID=cirpack.CircuitCode.ID;
|
// quick hack so we don't use the grid server for local testing
|
||||||
|
/*this.AgentID=cirpack.CircuitCode.ID;
|
||||||
this.SessionID=cirpack.CircuitCode.SessionID;
|
this.SessionID=cirpack.CircuitCode.SessionID;
|
||||||
this.CircuitCode=cirpack.CircuitCode.Code;
|
this.CircuitCode=cirpack.CircuitCode.Code;
|
||||||
InitNewClient();
|
InitNewClient();
|
||||||
ClientLoop();
|
ClientLoop();
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue