diff options
| author | Melanie | 2010-12-23 12:08:38 +0000 |
|---|---|---|
| committer | Melanie | 2010-12-23 12:08:38 +0000 |
| commit | 2cc07de0bac6c5eae48a3a61056ecedaa06c2bca (patch) | |
| tree | c8b32755bee00ff1b0dbf795bddd97ef5afc6aab /OpenSim/Region/CoreModules | |
| parent | Revert "reactivating some traces to track a dead thread" (diff) | |
| parent | Put back a commented section of code. With some viewers, object inventory (diff) | |
| download | opensim-SC-2cc07de0bac6c5eae48a3a61056ecedaa06c2bca.zip opensim-SC-2cc07de0bac6c5eae48a3a61056ecedaa06c2bca.tar.gz opensim-SC-2cc07de0bac6c5eae48a3a61056ecedaa06c2bca.tar.bz2 opensim-SC-2cc07de0bac6c5eae48a3a61056ecedaa06c2bca.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs index c5a6e62..4f9e32b 100644 --- a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs | |||
| @@ -105,12 +105,11 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer | |||
| 105 | } | 105 | } |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | // This should not be here | 108 | if (Requests.ContainsKey(fileName)) |
| 109 | //if (Requests.ContainsKey(fileName)) | 109 | { |
| 110 | //{ | 110 | RequestXfer(Requests[fileName].remoteClient, Requests[fileName].xferID, fileName); |
| 111 | // RequestXfer(Requests[fileName].remoteClient, Requests[fileName].xferID, fileName); | 111 | Requests.Remove(fileName); |
| 112 | // Requests.Remove(fileName); | 112 | } |
| 113 | //} | ||
| 114 | 113 | ||
| 115 | return true; | 114 | return true; |
| 116 | } | 115 | } |