Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-12-23 12:08:38 +00:00
4 changed files with 36 additions and 11 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;
}