diff options
author | Justin Clarke Casey | 2007-12-15 21:58:07 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2007-12-15 21:58:07 +0000 |
commit | 019d6626068920283b700440e780c86c162ca7c6 (patch) | |
tree | 7c0a9ec1ca185257cee0463a73feef882be23878 /OpenSim/Framework/Data.SQLite | |
parent | more dorking around with exporter. Still far (diff) | |
download | opensim-SC_OLD-019d6626068920283b700440e780c86c162ca7c6.zip opensim-SC_OLD-019d6626068920283b700440e780c86c162ca7c6.tar.gz opensim-SC_OLD-019d6626068920283b700440e780c86c162ca7c6.tar.bz2 opensim-SC_OLD-019d6626068920283b700440e780c86c162ca7c6.tar.xz |
Put out a more comprehensible message when user authentication fails than the current NullReferenceException based one
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Data.SQLite/SQLiteUserData.cs | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs index da27277..346febc 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs | |||
@@ -72,11 +72,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
72 | return; | 72 | return; |
73 | } | 73 | } |
74 | 74 | ||
75 | /// <summary> | 75 | // see IUserData |
76 | /// Loads a specified user profile from a UUID | ||
77 | /// </summary> | ||
78 | /// <param name="uuid">The user's UUID</param> | ||
79 | /// <returns>A user profile</returns> | ||
80 | public UserProfileData GetUserByUUID(LLUUID uuid) | 76 | public UserProfileData GetUserByUUID(LLUUID uuid) |
81 | { | 77 | { |
82 | lock (ds) | 78 | lock (ds) |
@@ -99,22 +95,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
99 | } | 95 | } |
100 | } | 96 | } |
101 | 97 | ||
102 | /// <summary> | 98 | // see IUserData |
103 | /// Returns a user by searching for its name | ||
104 | /// </summary> | ||
105 | /// <param name="name">The user's account name</param> | ||
106 | /// <returns>A matching user profile</returns> | ||
107 | public UserProfileData GetUserByName(string name) | ||
108 | { | ||
109 | return GetUserByName(name.Split(' ')[0], name.Split(' ')[1]); | ||
110 | } | ||
111 | |||
112 | /// <summary> | ||
113 | /// Returns a user by searching for its name | ||
114 | /// </summary> | ||
115 | /// <param name="fname">The first part of the user's account name</param> | ||
116 | /// <param name="lname">The second part of the user's account name</param> | ||
117 | /// <returns>A matching user profile</returns> | ||
118 | public UserProfileData GetUserByName(string fname, string lname) | 99 | public UserProfileData GetUserByName(string fname, string lname) |
119 | { | 100 | { |
120 | string select = "surname = '" + lname + "' and username = '" + fname + "'"; | 101 | string select = "surname = '" + lname + "' and username = '" + fname + "'"; |