aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
diff options
context:
space:
mode:
authorubit2012-07-17 02:07:21 +0200
committerubit2012-07-17 02:07:21 +0200
commite925b0654d12c534ff9f837355ad43483dbd22cb (patch)
treee8a05e918e55ec8034dd724c38f143aac31493b2 /OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentMerge branch 'avination' into ubitwork (diff)
downloadopensim-SC-e925b0654d12c534ff9f837355ad43483dbd22cb.zip
opensim-SC-e925b0654d12c534ff9f837355ad43483dbd22cb.tar.gz
opensim-SC-e925b0654d12c534ff9f837355ad43483dbd22cb.tar.bz2
opensim-SC-e925b0654d12c534ff9f837355ad43483dbd22cb.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs')
-rw-r--r--OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs14
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs b/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
index b73df2c..2fbebc4 100644
--- a/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
@@ -126,6 +126,11 @@ namespace OpenSim.Tests.Common
126 return CreateUserWithInventory(scene, "Bill", "Bailey", userId, "troll"); 126 return CreateUserWithInventory(scene, "Bill", "Bailey", userId, "troll");
127 } 127 }
128 128
129 public static UserAccount CreateUserWithInventory(Scene scene, int userId)
130 {
131 return CreateUserWithInventory(scene, "Bill", "Bailey", TestHelpers.ParseTail(userId), "troll");
132 }
133
129 public static UserAccount CreateUserWithInventory( 134 public static UserAccount CreateUserWithInventory(
130 Scene scene, string firstName, string lastName, UUID userId, string pw) 135 Scene scene, string firstName, string lastName, UUID userId, string pw)
131 { 136 {
@@ -133,6 +138,15 @@ namespace OpenSim.Tests.Common
133 CreateUserWithInventory(scene, ua, pw); 138 CreateUserWithInventory(scene, ua, pw);
134 return ua; 139 return ua;
135 } 140 }
141
142 public static UserAccount CreateUserWithInventory(
143 Scene scene, string firstName, string lastName, int userId, string pw)
144 {
145 UserAccount ua
146 = new UserAccount(TestHelpers.ParseTail(userId)) { FirstName = firstName, LastName = lastName };
147 CreateUserWithInventory(scene, ua, pw);
148 return ua;
149 }
136 150
137 public static void CreateUserWithInventory(Scene scene, UserAccount ua, string pw) 151 public static void CreateUserWithInventory(Scene scene, UserAccount ua, string pw)
138 { 152 {