Applied Diva's patch from mantis #2590/ Trunk Revision 7200 to 0.6 stable branch
parent
9cf75f649d
commit
af4ff8686b
|
@ -599,7 +599,7 @@ namespace OpenSim.Framework.Communications.Cache
|
|||
|
||||
// It has an entry in our cache
|
||||
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.
|
||||
if (null == asset)
|
||||
{
|
||||
|
|
|
@ -1547,7 +1547,16 @@ namespace OpenSim.Region.Communications.OGS1
|
|||
|
||||
IPAddress 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)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue