Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

This commit is contained in:
Diva Canto
2010-12-23 10:05:45 -08:00
4 changed files with 39 additions and 13 deletions

View File

@@ -105,12 +105,11 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
}
}
// This should not be here
//if (Requests.ContainsKey(fileName))
//{
// RequestXfer(Requests[fileName].remoteClient, Requests[fileName].xferID, fileName);
// Requests.Remove(fileName);
//}
if (Requests.ContainsKey(fileName))
{
RequestXfer(Requests[fileName].remoteClient, Requests[fileName].xferID, fileName);
Requests.Remove(fileName);
}
return true;
}