diff options
| author | John Hurliman | 2009-09-30 17:51:34 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-09-30 17:51:34 -0700 |
| commit | cb26878f96adf99235709e1460474513d2e38f36 (patch) | |
| tree | ba23794b2c24f7c27bd3d1ed878f84d43292d7ee /OpenSim/Data | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC-cb26878f96adf99235709e1460474513d2e38f36.zip opensim-SC-cb26878f96adf99235709e1460474513d2e38f36.tar.gz opensim-SC-cb26878f96adf99235709e1460474513d2e38f36.tar.bz2 opensim-SC-cb26878f96adf99235709e1460474513d2e38f36.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/IUserData.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Data/Tests/BasicRegionTest.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/IUserData.cs b/OpenSim/Data/IUserData.cs index ee69366..e9a1e81 100644 --- a/OpenSim/Data/IUserData.cs +++ b/OpenSim/Data/IUserData.cs | |||
| @@ -54,7 +54,7 @@ namespace OpenSim.Data | |||
| 54 | 54 | ||
| 55 | /// <summary> | 55 | /// <summary> |
| 56 | /// Get a user from a given uri. | 56 | /// Get a user from a given uri. |
| 57 | /// </summary> | 57 | /// </summary> |
| 58 | /// <param name="uri"></param> | 58 | /// <param name="uri"></param> |
| 59 | /// <returns>The user data profile. Null if no user is found.</returns> | 59 | /// <returns>The user data profile. Null if no user is found.</returns> |
| 60 | UserProfileData GetUserByUri(Uri uri); | 60 | UserProfileData GetUserByUri(Uri uri); |
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs index ca1fcfa..97990e1 100644 --- a/OpenSim/Data/Tests/BasicRegionTest.cs +++ b/OpenSim/Data/Tests/BasicRegionTest.cs | |||
| @@ -497,7 +497,7 @@ namespace OpenSim.Data.Tests | |||
| 497 | Quaternion rotoff = new Quaternion(random.Next(),random.Next(),random.Next(),random.Next()); | 497 | Quaternion rotoff = new Quaternion(random.Next(),random.Next(),random.Next(),random.Next()); |
| 498 | Vector3 velocity = new Vector3(random.Next(),random.Next(),random.Next()); | 498 | Vector3 velocity = new Vector3(random.Next(),random.Next(),random.Next()); |
| 499 | Vector3 angvelo = new Vector3(random.Next(),random.Next(),random.Next()); | 499 | Vector3 angvelo = new Vector3(random.Next(),random.Next(),random.Next()); |
| 500 | Vector3 accel = new Vector3(random.Next(),random.Next(),random.Next()); | 500 | Vector3 accel = new Vector3(random.Next(),random.Next(),random.Next()); |
| 501 | 501 | ||
| 502 | sop.GroupPosition = groupos; | 502 | sop.GroupPosition = groupos; |
| 503 | sop.RotationOffset = rotoff; | 503 | sop.RotationOffset = rotoff; |