diff options
| author | Teravus Ovares (Dan Olivares) | 2009-11-22 22:05:26 -0500 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-11-22 22:05:26 -0500 |
| commit | 94cb4b486a7c72841ccbcec403fc7b8c95c1249a (patch) | |
| tree | 176ada6e4259c076ab6942b4c96538d868880281 /OpenSim/Tests | |
| parent | * Adds a test for if the collision is at the bottom of the capsule on avatar.... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.zip opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.gz opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.bz2 opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/MockUserService.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Tests/Common/Setup/AssetHelpers.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Tests/Common/Mock/MockUserService.cs b/OpenSim/Tests/Common/Mock/MockUserService.cs index 62c41c7..396ef25 100644 --- a/OpenSim/Tests/Common/Mock/MockUserService.cs +++ b/OpenSim/Tests/Common/Mock/MockUserService.cs | |||
| @@ -34,7 +34,7 @@ using OpenSim.Framework.Communications.Cache; | |||
| 34 | using OpenSim.Services.Interfaces; | 34 | using OpenSim.Services.Interfaces; |
| 35 | 35 | ||
| 36 | namespace OpenSim.Tests.Common | 36 | namespace OpenSim.Tests.Common |
| 37 | { | 37 | { |
| 38 | public class MockUserService : IUserService | 38 | public class MockUserService : IUserService |
| 39 | { | 39 | { |
| 40 | public void AddTemporaryUserProfile(UserProfileData userProfile) | 40 | public void AddTemporaryUserProfile(UserProfileData userProfile) |
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 | } |