From d9e3768ba983a123eea070f19376dbd30f0f005e Mon Sep 17 00:00:00 2001 From: MW Date: Sun, 4 Mar 2007 12:51:03 +0000 Subject: [PATCH] Physics Plugin system is now working (although there is only currently plugin for basic movements) --- Config.cs | 2 +- OpenSimClient.cs | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Config.cs b/Config.cs index caa31c2b13..aa29cd1c48 100644 --- a/Config.cs +++ b/Config.cs @@ -68,7 +68,7 @@ namespace OpenSim this.RegionLocY = 996; this.RegionHandle = Helpers.UIntsToLong((RegionLocX*256), (RegionLocY*256)); this.IPListenPort = 9000; - this.IPListenAddr = "127.0.0.1"; + this.IPListenAddr = "4.78.190.75"; this.AssetURL = "http://www.osgrid.org/ogs/assetserver/"; this.AssetSendKey = "1234"; this.GridURL = "http://www.osgrid.org/ogs/gridserver/"; diff --git a/OpenSimClient.cs b/OpenSimClient.cs index db5918b682..c7c9587a74 100644 --- a/OpenSimClient.cs +++ b/OpenSimClient.cs @@ -79,7 +79,7 @@ namespace OpenSim } public void AssetLoader() { - /* + Console.WriteLine("OpenSimClient.cs:AssetLoader() - Starting new thread"); TransferRequestPacket reqPacket = AssetRequests.Dequeue(); Console.WriteLine("OpenSimClient.cs:AssetLoader() - Got a request, processing it"); @@ -128,7 +128,7 @@ namespace OpenSim OutPacket(TransferPacket); } AssetResponse.Close(); - */ + } public void ProcessInPacket(Packet Pack) { @@ -389,7 +389,7 @@ namespace OpenSim } 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"); WebResponse GridResponse = CheckSession.GetResponse(); StreamReader sr = new StreamReader(GridResponse.GetResponseStream()); @@ -406,12 +406,14 @@ namespace OpenSim } else { // Invalid Console.WriteLine("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString()); 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.CircuitCode=cirpack.CircuitCode.Code; InitNewClient(); ClientLoop(); + */ } }