diff options
author | Melanie | 2014-01-28 21:02:20 +0000 |
---|---|---|
committer | Melanie | 2014-01-28 21:02:20 +0000 |
commit | c6e9db58669d773c85041db99b19b942f70324f7 (patch) | |
tree | 99f69fb669332cff69a45ce6f7473aed6d965a0d /OpenSim/Tests/Common/TestHelpers.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'justincc-master' (diff) | |
download | opensim-SC_OLD-c6e9db58669d773c85041db99b19b942f70324f7.zip opensim-SC_OLD-c6e9db58669d773c85041db99b19b942f70324f7.tar.gz opensim-SC_OLD-c6e9db58669d773c85041db99b19b942f70324f7.tar.bz2 opensim-SC_OLD-c6e9db58669d773c85041db99b19b942f70324f7.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/RegionSettings.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
Diffstat (limited to 'OpenSim/Tests/Common/TestHelpers.cs')
-rw-r--r-- | OpenSim/Tests/Common/TestHelpers.cs | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/TestHelpers.cs b/OpenSim/Tests/Common/TestHelpers.cs index a684d72..6bf23f8 100644 --- a/OpenSim/Tests/Common/TestHelpers.cs +++ b/OpenSim/Tests/Common/TestHelpers.cs | |||
@@ -117,8 +117,6 @@ namespace OpenSim.Tests.Common | |||
117 | /// Parse a UUID stem into a full UUID. | 117 | /// Parse a UUID stem into a full UUID. |
118 | /// </summary> | 118 | /// </summary> |
119 | /// <remarks> | 119 | /// <remarks> |
120 | /// Yes, this is completely inconsistent with ParseTail but this is probably a better way to do it, | ||
121 | /// UUIDs are conceptually not hexadecmial numbers. | ||
122 | /// The fragment will come at the start of the UUID. The rest will be 0s | 120 | /// The fragment will come at the start of the UUID. The rest will be 0s |
123 | /// </remarks> | 121 | /// </remarks> |
124 | /// <returns></returns> | 122 | /// <returns></returns> |
@@ -143,5 +141,24 @@ namespace OpenSim.Tests.Common | |||
143 | { | 141 | { |
144 | return new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", tail)); | 142 | return new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", tail)); |
145 | } | 143 | } |
144 | |||
145 | /// <summary> | ||
146 | /// Parse a UUID tail section into a full UUID. | ||
147 | /// </summary> | ||
148 | /// <remarks> | ||
149 | /// The fragment will come at the end of the UUID. The rest will be 0s | ||
150 | /// </remarks> | ||
151 | /// <returns></returns> | ||
152 | /// <param name='frag'> | ||
153 | /// A UUID fragment that will be parsed into a full UUID. Therefore, it can only contain | ||
154 | /// cahracters which are valid in a UUID, except for "-" which is currently only allowed if a full UUID is | ||
155 | /// given as the 'fragment'. | ||
156 | /// </param> | ||
157 | public static UUID ParseTail(string stem) | ||
158 | { | ||
159 | string rawUuid = stem.PadLeft(32, '0'); | ||
160 | |||
161 | return UUID.Parse(rawUuid); | ||
162 | } | ||
146 | } | 163 | } |
147 | } | 164 | } |