aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-01-20 19:34:55 +0000
committerJustin Clark-Casey (justincc)2014-01-20 19:34:55 +0000
commit2cf7478b9a33575273900ff995c74f1e8167f8b9 (patch)
tree10ee6a783456979aa63219cc387c078a7ec9fc65 /OpenSim/Tests/Common
parentupdate OpenMetaverse.StructuredData to git master (bf4e9f654ff99c85e20b53e56f... (diff)
parentStop exceptions being generated on agent connection if a telehub object has b... (diff)
downloadopensim-SC_OLD-2cf7478b9a33575273900ff995c74f1e8167f8b9.zip
opensim-SC_OLD-2cf7478b9a33575273900ff995c74f1e8167f8b9.tar.gz
opensim-SC_OLD-2cf7478b9a33575273900ff995c74f1e8167f8b9.tar.bz2
opensim-SC_OLD-2cf7478b9a33575273900ff995c74f1e8167f8b9.tar.xz
Merge branch 'justincc-master'
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs5
-rw-r--r--OpenSim/Tests/Common/TestHelpers.cs21
2 files changed, 19 insertions, 7 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 9370102..a4247e3 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -788,11 +788,6 @@ namespace OpenSim.Tests.Common.Mock
788 { 788 {
789 OnRegionHandShakeReply(this); 789 OnRegionHandShakeReply(this);
790 } 790 }
791
792 if (OnCompleteMovementToRegion != null)
793 {
794 OnCompleteMovementToRegion(this, true);
795 }
796 } 791 }
797 792
798 public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID) 793 public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
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}