diff options
| author | Mic Bowman | 2011-08-05 11:13:02 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-05 11:13:02 -0700 |
| commit | c3f579046c4de7a5a65e71e4c02958425fd7998a (patch) | |
| tree | b725d9eaa66d5eb7cf1f87ddbb4fa0f4284f71f5 /OpenSim/Tests/Common/Helpers | |
| parent | BulletSim: Parameters settable from ini file. Linksets. Physical property val... (diff) | |
| parent | remove the largely unused copy/pasted HandleAgentRequestSit() method (diff) | |
| download | opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.zip opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.gz opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.bz2 opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Tests/Common/Helpers')
| -rw-r--r-- | OpenSim/Tests/Common/Helpers/AssetHelpers.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs index 9b68331..99eb124 100644 --- a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs | |||
| @@ -42,7 +42,7 @@ namespace OpenSim.Tests.Common | |||
| 42 | /// <returns></returns> | 42 | /// <returns></returns> |
| 43 | public static AssetBase CreateAsset() | 43 | public static AssetBase CreateAsset() |
| 44 | { | 44 | { |
| 45 | return CreateAsset(UUID.Random(), AssetType.Notecard, "hello", UUID.Random()); | 45 | return CreateAsset(UUID.Random()); |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | /// <summary> | 48 | /// <summary> |
| @@ -50,9 +50,9 @@ namespace OpenSim.Tests.Common | |||
| 50 | /// </summary> | 50 | /// </summary> |
| 51 | /// <param name="creatorId">/param> | 51 | /// <param name="creatorId">/param> |
| 52 | /// <returns></returns> | 52 | /// <returns></returns> |
| 53 | public static AssetBase CreateAsset(UUID creatorId) | 53 | public static AssetBase CreateAsset(UUID id) |
| 54 | { | 54 | { |
| 55 | return CreateAsset(UUID.Random(), AssetType.Notecard, "hello", creatorId); | 55 | return CreateAsset(id, AssetType.Notecard, "hello", UUID.Random()); |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | /// <summary> | 58 | /// <summary> |