diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Framework/LocklessQueue.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/LocklessQueue.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/LocklessQueue.cs b/OpenSim/Framework/LocklessQueue.cs index 7ccbba7..21b8178 100644 --- a/OpenSim/Framework/LocklessQueue.cs +++ b/OpenSim/Framework/LocklessQueue.cs | |||
| @@ -102,7 +102,7 @@ namespace OpenSim.Framework | |||
| 102 | } | 102 | } |
| 103 | else | 103 | else |
| 104 | { | 104 | { |
| 105 | item = oldHeadNext.Item; | 105 | item = oldHeadNext.Item; |
| 106 | haveAdvancedHead = CAS(ref head, oldHead, oldHeadNext); | 106 | haveAdvancedHead = CAS(ref head, oldHead, oldHeadNext); |
| 107 | if (haveAdvancedHead) | 107 | if (haveAdvancedHead) |
| 108 | { | 108 | { |