diff options
author | Justin Clark-Casey (justincc) | 2009-09-09 18:03:49 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-09-09 18:03:49 +0100 |
commit | 0683cf6e0d541571d04d6511dc0ecabb17dd1e1e (patch) | |
tree | 13693d05d9bf2c3514266fab1f649de455477cf1 /OpenSim/Framework/Communications/Osp/OspResolver.cs | |
parent | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-0683cf6e0d541571d04d6511dc0ecabb17dd1e1e.zip opensim-SC_OLD-0683cf6e0d541571d04d6511dc0ecabb17dd1e1e.tar.gz opensim-SC_OLD-0683cf6e0d541571d04d6511dc0ecabb17dd1e1e.tar.bz2 opensim-SC_OLD-0683cf6e0d541571d04d6511dc0ecabb17dd1e1e.tar.xz |
Add test to check behaviour if an iar is loaded where no user profile exists for the creators
Disable generation of temporary profiles for now, instead record loading user as creator
Diffstat (limited to 'OpenSim/Framework/Communications/Osp/OspResolver.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Osp/OspResolver.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Osp/OspResolver.cs b/OpenSim/Framework/Communications/Osp/OspResolver.cs index 502fee3..e98317a 100644 --- a/OpenSim/Framework/Communications/Osp/OspResolver.cs +++ b/OpenSim/Framework/Communications/Osp/OspResolver.cs | |||
@@ -153,7 +153,9 @@ namespace OpenSim.Framework.Communications.Osp | |||
153 | CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(firstName, lastName); | 153 | CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(firstName, lastName); |
154 | if (userInfo != null) | 154 | if (userInfo != null) |
155 | return userInfo.UserProfile.ID; | 155 | return userInfo.UserProfile.ID; |
156 | 156 | ||
157 | // XXX: Disable temporary user profile creation for now as implementation is incomplete - justincc | ||
158 | /* | ||
157 | UserProfileData tempUserProfile = new UserProfileData(); | 159 | UserProfileData tempUserProfile = new UserProfileData(); |
158 | tempUserProfile.FirstName = firstName; | 160 | tempUserProfile.FirstName = firstName; |
159 | tempUserProfile.SurName = lastName; | 161 | tempUserProfile.SurName = lastName; |
@@ -164,6 +166,9 @@ namespace OpenSim.Framework.Communications.Osp | |||
164 | commsManager.UserService.AddTemporaryUserProfile(tempUserProfile); | 166 | commsManager.UserService.AddTemporaryUserProfile(tempUserProfile); |
165 | 167 | ||
166 | return tempUserProfile.ID; | 168 | return tempUserProfile.ID; |
169 | */ | ||
170 | |||
171 | return UUID.Zero; | ||
167 | } | 172 | } |
168 | } | 173 | } |
169 | } | 174 | } |