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

Applied Diva's patch from mantis #2590/ Trunk Revision 7200 to 0.6 stable branch

0.6.0-stable
MW 2008-11-14 10:38:47 +00:00
parent 9cf75f649d
commit af4ff8686b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@ -599,7 +599,7 @@ namespace OpenSim.Framework.Communications.Cache
// It has an entry in our cache // It has an entry in our cache
AssetInfo asset = Assets[requestID]; AssetInfo asset = Assets[requestID];
// FIXME: We never tell the client about assets which do not exist when requested by this transfer mechanism, which can't be right. // FIXME: We never tell the client about assets which do not exist when requested by this transfer mechanism, which can't be right.
if (null == asset) if (null == asset)
{ {

11
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -1547,7 +1547,16 @@ namespace OpenSim.Region.Communications.OGS1
IPAddress ia; IPAddress ia;
IPAddress.TryParse(address, out ia); IPAddress.TryParse(address, out ia);
IPEndPoint m_EndPoint = new IPEndPoint(ia, (int)port); IPEndPoint m_EndPoint;
try
{
m_EndPoint = new IPEndPoint(ia, (int)port);
}
catch (Exception)
{
m_log.Debug("[OGS1 GRID SERVICES]: Invalid remoting address: " + address);
return false;
}
AsyncCallback callback = delegate(IAsyncResult iar) AsyncCallback callback = delegate(IAsyncResult iar)
{ {