OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* remove some spurious debug info 

* The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think)..    But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs..     I'll sign off on it.

Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
viewer-2-initial-appearance
Jonathan Freedman 2010-10-20 02:36:59 -04:00 committed by Teravus Ovares (Dan Olivares)
parent 58f75fa19d
commit 017b83d0a3
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@ -348,7 +348,7 @@ namespace OpenSim.Framework.Servers.HttpServer
{ {
try try
{ {
m_log.Debug("[BASE HTTP SERVER]: Handling request to " + request.RawUrl); //m_log.Debug("[BASE HTTP SERVER]: Handling request to " + request.RawUrl);
Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true); Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true);
@ -376,11 +376,11 @@ namespace OpenSim.Framework.Servers.HttpServer
string path = request.RawUrl; string path = request.RawUrl;
string handlerKey = GetHandlerKey(request.HttpMethod, path); string handlerKey = GetHandlerKey(request.HttpMethod, path);
m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); //m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path);
if (TryGetStreamHandler(handlerKey, out requestHandler)) if (TryGetStreamHandler(handlerKey, out requestHandler))
{ {
m_log.Debug("[BASE HTTP SERVER]: Found Stream Handler"); //m_log.Debug("[BASE HTTP SERVER]: Found Stream Handler");
// Okay, so this is bad, but should be considered temporary until everything is IStreamHandler. // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler.
byte[] buffer = null; byte[] buffer = null;
@ -395,7 +395,7 @@ namespace OpenSim.Framework.Servers.HttpServer
} }
else if (requestHandler is IGenericHTTPHandler) else if (requestHandler is IGenericHTTPHandler)
{ {
m_log.Debug("[BASE HTTP SERVER]: Found Caps based HTTP Handler"); //m_log.Debug("[BASE HTTP SERVER]: Found Caps based HTTP Handler");
IGenericHTTPHandler HTTPRequestHandler = requestHandler as IGenericHTTPHandler; IGenericHTTPHandler HTTPRequestHandler = requestHandler as IGenericHTTPHandler;
Stream requestStream = request.InputStream; Stream requestStream = request.InputStream;
@ -422,7 +422,7 @@ namespace OpenSim.Framework.Servers.HttpServer
foreach (string headername in rHeaders) foreach (string headername in rHeaders)
{ {
m_log.Warn("[HEADER]: " + headername + "=" + request.Headers[headername]); //m_log.Warn("[HEADER]: " + headername + "=" + request.Headers[headername]);
headervals[headername] = request.Headers[headername]; headervals[headername] = request.Headers[headername];
} }

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -2976,6 +2976,8 @@ namespace OpenSim.Region.Framework.Scenes
public void CopyTo(AgentData cAgent) public void CopyTo(AgentData cAgent)
{ {
cAgent.CallbackURI = m_callbackURI;
cAgent.AgentID = UUID; cAgent.AgentID = UUID;
cAgent.RegionID = Scene.RegionInfo.RegionID; cAgent.RegionID = Scene.RegionInfo.RegionID;

30
OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
View File

@ -116,19 +116,19 @@ namespace OpenSim.Services.Connectors.Hypergrid
if (success) if (success)
{ {
UUID.TryParse((string)hash["uuid"], out regionID); UUID.TryParse((string)hash["uuid"], out regionID);
m_log.Debug(">> HERE, uuid: " + regionID); //m_log.Debug(">> HERE, uuid: " + regionID);
if ((string)hash["handle"] != null) if ((string)hash["handle"] != null)
{ {
realHandle = Convert.ToUInt64((string)hash["handle"]); realHandle = Convert.ToUInt64((string)hash["handle"]);
m_log.Debug(">> HERE, realHandle: " + realHandle); //m_log.Debug(">> HERE, realHandle: " + realHandle);
} }
if (hash["region_image"] != null) { if (hash["region_image"] != null) {
imageURL = (string)hash["region_image"]; imageURL = (string)hash["region_image"];
m_log.Debug(">> HERE, imageURL: " + imageURL); //m_log.Debug(">> HERE, imageURL: " + imageURL);
} }
if (hash["external_name"] != null) { if (hash["external_name"] != null) {
externalName = (string)hash["external_name"]; externalName = (string)hash["external_name"];
m_log.Debug(">> HERE, externalName: " + externalName); //m_log.Debug(">> HERE, externalName: " + externalName);
} }
} }
@ -191,7 +191,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
paramList.Add(hash); paramList.Add(hash);
XmlRpcRequest request = new XmlRpcRequest("get_region", paramList); XmlRpcRequest request = new XmlRpcRequest("get_region", paramList);
m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: contacting " + gatekeeper.ServerURI); //m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: contacting " + gatekeeper.ServerURI);
XmlRpcResponse response = null; XmlRpcResponse response = null;
try try
{ {
@ -199,7 +199,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Exception " + e.Message); //m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Exception " + e.Message);
return null; return null;
} }
@ -210,8 +210,8 @@ namespace OpenSim.Services.Connectors.Hypergrid
} }
hash = (Hashtable)response.Value; hash = (Hashtable)response.Value;
foreach (Object o in hash) //foreach (Object o in hash)
m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); // m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value);
try try
{ {
bool success = false; bool success = false;
@ -221,41 +221,41 @@ namespace OpenSim.Services.Connectors.Hypergrid
GridRegion region = new GridRegion(); GridRegion region = new GridRegion();
UUID.TryParse((string)hash["uuid"], out region.RegionID); UUID.TryParse((string)hash["uuid"], out region.RegionID);
m_log.Debug(">> HERE, uuid: " + region.RegionID); //m_log.Debug(">> HERE, uuid: " + region.RegionID);
int n = 0; int n = 0;
if (hash["x"] != null) if (hash["x"] != null)
{ {
Int32.TryParse((string)hash["x"], out n); Int32.TryParse((string)hash["x"], out n);
region.RegionLocX = n; region.RegionLocX = n;
m_log.Debug(">> HERE, x: " + region.RegionLocX); //m_log.Debug(">> HERE, x: " + region.RegionLocX);
} }
if (hash["y"] != null) if (hash["y"] != null)
{ {
Int32.TryParse((string)hash["y"], out n); Int32.TryParse((string)hash["y"], out n);
region.RegionLocY = n; region.RegionLocY = n;
m_log.Debug(">> HERE, y: " + region.RegionLocY); //m_log.Debug(">> HERE, y: " + region.RegionLocY);
} }
if (hash["region_name"] != null) if (hash["region_name"] != null)
{ {
region.RegionName = (string)hash["region_name"]; region.RegionName = (string)hash["region_name"];
m_log.Debug(">> HERE, region_name: " + region.RegionName); //m_log.Debug(">> HERE, region_name: " + region.RegionName);
} }
if (hash["hostname"] != null) if (hash["hostname"] != null)
region.ExternalHostName = (string)hash["hostname"]; region.ExternalHostName = (string)hash["hostname"];
m_log.Debug(">> HERE, hostname: " + region.ExternalHostName); //m_log.Debug(">> HERE, hostname: " + region.ExternalHostName);
if (hash["http_port"] != null) if (hash["http_port"] != null)
{ {
uint p = 0; uint p = 0;
UInt32.TryParse((string)hash["http_port"], out p); UInt32.TryParse((string)hash["http_port"], out p);
region.HttpPort = p; region.HttpPort = p;
m_log.Debug(">> HERE, http_port: " + region.HttpPort); //m_log.Debug(">> HERE, http_port: " + region.HttpPort);
} }
if (hash["internal_port"] != null) if (hash["internal_port"] != null)
{ {
int p = 0; int p = 0;
Int32.TryParse((string)hash["internal_port"], out p); Int32.TryParse((string)hash["internal_port"], out p);
region.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), p); region.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), p);
m_log.Debug(">> HERE, internal_port: " + region.InternalEndPoint); //m_log.Debug(">> HERE, internal_port: " + region.InternalEndPoint);
} }
// Successful return // Successful return