aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/IUserData.cs
diff options
context:
space:
mode:
authorMelanie2009-10-02 08:23:38 +0100
committerMelanie2009-10-02 08:23:38 +0100
commit31d8cec0f8cd47ff445edc7771e5e73825a57927 (patch)
treea2d60604317739fa530502c40ffc71bab2a5c494 /OpenSim/Data/IUserData.cs
parentRestore the missing image handling to the image manager. The missing (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.zip
opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.gz
opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.bz2
opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.xz
Merge branch 'master' into diva-textures
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/IUserData.cs2
1 files changed, 1 insertions, 1 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);