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/Data/Tests/PropertyScrambler.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/Data/Tests/PropertyScrambler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/Tests/PropertyScrambler.cs b/OpenSim/Data/Tests/PropertyScrambler.cs index e0f5862..0d291df 100644 --- a/OpenSim/Data/Tests/PropertyScrambler.cs +++ b/OpenSim/Data/Tests/PropertyScrambler.cs | |||
| @@ -42,7 +42,7 @@ namespace OpenSim.Data.Tests | |||
| 42 | public class PropertyScrambler<T> | 42 | public class PropertyScrambler<T> |
| 43 | { | 43 | { |
| 44 | readonly System.Collections.Generic.List<string> membersToNotScramble = new List<string>(); | 44 | readonly System.Collections.Generic.List<string> membersToNotScramble = new List<string>(); |
| 45 | 45 | ||
| 46 | private void AddExpressionToNotScrableList(Expression expression) | 46 | private void AddExpressionToNotScrableList(Expression expression) |
| 47 | { | 47 | { |
| 48 | UnaryExpression unaryExpression = expression as UnaryExpression; | 48 | UnaryExpression unaryExpression = expression as UnaryExpression; |