diff options
| author | Melanie | 2009-11-23 04:24:58 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-23 04:24:58 +0000 |
| commit | df121a7cd065cc067818f6a39a44ddaaab647fec (patch) | |
| tree | 5cc0e157ff3aefad066c07a1ebea2ae4b1ebdbe4 /OpenSim/Tests/Common/Setup | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | * Adds a modicum of additional checking to the Inventory Service (MySQL only) (diff) | |
| download | opensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.zip opensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.tar.gz opensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.tar.bz2 opensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Tests/Common/Setup/AssetHelpers.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Setup/AssetHelpers.cs b/OpenSim/Tests/Common/Setup/AssetHelpers.cs index df69cd9..1188b62 100644 --- a/OpenSim/Tests/Common/Setup/AssetHelpers.cs +++ b/OpenSim/Tests/Common/Setup/AssetHelpers.cs | |||
| @@ -32,7 +32,7 @@ using OpenSim.Region.Framework.Scenes; | |||
| 32 | using OpenSim.Region.Framework.Scenes.Serialization; | 32 | using OpenSim.Region.Framework.Scenes.Serialization; |
| 33 | 33 | ||
| 34 | namespace OpenSim.Tests.Common | 34 | namespace OpenSim.Tests.Common |
| 35 | { | 35 | { |
| 36 | public class AssetHelpers | 36 | public class AssetHelpers |
| 37 | { | 37 | { |
| 38 | /// <summary> | 38 | /// <summary> |
diff --git a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs index 1b06a46..cb76bc1 100644 --- a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs +++ b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs | |||
| @@ -113,6 +113,6 @@ namespace OpenSim.Tests.Common.Setup | |||
| 113 | userInfo.FetchInventory(); | 113 | userInfo.FetchInventory(); |
| 114 | 114 | ||
| 115 | return userInfo; | 115 | return userInfo; |
| 116 | } | 116 | } |
| 117 | } | 117 | } |
| 118 | } | 118 | } |