diff options
| author | Melanie | 2012-06-28 03:21:08 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-28 03:21:08 +0100 |
| commit | 41a1903c60475fc2d98b1b11d336a3ecee0bc150 (patch) | |
| tree | 0e78852eee96e9506b815cea0abbd35ac7da7f1a /OpenSim/Tests/Common/Helpers | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Avoid reporting false positives when a colon is in a comment in the first lin... (diff) | |
| download | opensim-SC-41a1903c60475fc2d98b1b11d336a3ecee0bc150.zip opensim-SC-41a1903c60475fc2d98b1b11d336a3ecee0bc150.tar.gz opensim-SC-41a1903c60475fc2d98b1b11d336a3ecee0bc150.tar.bz2 opensim-SC-41a1903c60475fc2d98b1b11d336a3ecee0bc150.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs b/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs index b73df2c..3d3e65c 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 | { |