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/MapItemReplyStruct.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 'OpenSim/Framework/MapItemReplyStruct.cs')
| -rw-r--r-- | OpenSim/Framework/MapItemReplyStruct.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/MapItemReplyStruct.cs b/OpenSim/Framework/MapItemReplyStruct.cs index c8693ae..348a240 100644 --- a/OpenSim/Framework/MapItemReplyStruct.cs +++ b/OpenSim/Framework/MapItemReplyStruct.cs | |||
| @@ -60,7 +60,7 @@ namespace OpenSim.Framework | |||
| 60 | map["Extra2"] = OSD.FromInteger(Extra2); | 60 | map["Extra2"] = OSD.FromInteger(Extra2); |
| 61 | return map; | 61 | return map; |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | public void FromOSD(OSDMap map) | 64 | public void FromOSD(OSDMap map) |
| 65 | { | 65 | { |
| 66 | x = (uint) map["X"].AsInteger(); | 66 | x = (uint) map["X"].AsInteger(); |