aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Osp/OspResolver.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Communications/Osp/OspResolver.cs')
-rw-r--r--OpenSim/Framework/Communications/Osp/OspResolver.cs19
1 files changed, 9 insertions, 10 deletions
diff --git a/OpenSim/Framework/Communications/Osp/OspResolver.cs b/OpenSim/Framework/Communications/Osp/OspResolver.cs
index a62e1c0..579b3df 100644
--- a/OpenSim/Framework/Communications/Osp/OspResolver.cs
+++ b/OpenSim/Framework/Communications/Osp/OspResolver.cs
@@ -85,16 +85,15 @@ namespace OpenSim.Framework.Communications.Osp
85 /// <param name="ospa"></param> 85 /// <param name="ospa"></param>
86 /// <param name="commsManager"></param> 86 /// <param name="commsManager"></param>
87 /// <returns> 87 /// <returns>
88 /// A suitable internal OpenSim identifier. If the input string wasn't ospi data, then we simply 88 /// A suitable UUID for use in Second Life client communication. If the string was not a valid ospa, then UUID.Zero
89 /// return that same string. If the input string was ospi data but no valid profile information has been found, 89 /// is returned.
90 /// then returns null.
91 /// </returns> 90 /// </returns>
92 public static string ResolveOspa(string ospa, CommunicationsManager commsManager) 91 public static UUID ResolveOspa(string ospa, CommunicationsManager commsManager)
93 { 92 {
94 m_log.DebugFormat("[OSP RESOLVER]: Resolving {0}", ospa); 93 m_log.DebugFormat("[OSP RESOLVER]: Resolving {0}", ospa);
95 94
96 if (!ospa.StartsWith(OSPA_PREFIX)) 95 if (!ospa.StartsWith(OSPA_PREFIX))
97 return ospa; 96 return UUID.Zero;
98 97
99 string ospaMeat = ospa.Substring(OSPA_PREFIX.Length); 98 string ospaMeat = ospa.Substring(OSPA_PREFIX.Length);
100 string[] ospaTuples = ospaMeat.Split(OSPA_TUPLE_SEPARATOR_ARRAY); 99 string[] ospaTuples = ospaMeat.Split(OSPA_TUPLE_SEPARATOR_ARRAY);
@@ -116,7 +115,7 @@ namespace OpenSim.Framework.Communications.Osp
116 return ResolveOspaName(value, commsManager); 115 return ResolveOspaName(value, commsManager);
117 } 116 }
118 117
119 return null; 118 return UUID.Zero;
120 } 119 }
121 120
122 /// <summary> 121 /// <summary>
@@ -138,14 +137,14 @@ namespace OpenSim.Framework.Communications.Osp
138 /// <returns> 137 /// <returns>
139 /// An OpenSim internal identifier for the name given. Returns null if the name was not valid 138 /// An OpenSim internal identifier for the name given. Returns null if the name was not valid
140 /// </returns> 139 /// </returns>
141 protected static string ResolveOspaName(string name, CommunicationsManager commsManager) 140 protected static UUID ResolveOspaName(string name, CommunicationsManager commsManager)
142 { 141 {
143 int nameSeparatorIndex = name.IndexOf(OSPA_NAME_VALUE_SEPARATOR); 142 int nameSeparatorIndex = name.IndexOf(OSPA_NAME_VALUE_SEPARATOR);
144 143
145 if (nameSeparatorIndex < 0) 144 if (nameSeparatorIndex < 0)
146 { 145 {
147 m_log.WarnFormat("[OSP RESOLVER]: Ignoring unseparated name {0}", name); 146 m_log.WarnFormat("[OSP RESOLVER]: Ignoring unseparated name {0}", name);
148 return null; 147 return UUID.Zero;
149 } 148 }
150 149
151 string firstName = name.Remove(nameSeparatorIndex).TrimEnd(); 150 string firstName = name.Remove(nameSeparatorIndex).TrimEnd();
@@ -153,7 +152,7 @@ namespace OpenSim.Framework.Communications.Osp
153 152
154 CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(firstName, lastName); 153 CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(firstName, lastName);
155 if (userInfo != null) 154 if (userInfo != null)
156 return userInfo.UserProfile.ID.ToString(); 155 return userInfo.UserProfile.ID;
157 156
158 UserProfileData tempUserProfile = new UserProfileData(); 157 UserProfileData tempUserProfile = new UserProfileData();
159 tempUserProfile.FirstName = firstName; 158 tempUserProfile.FirstName = firstName;
@@ -164,7 +163,7 @@ namespace OpenSim.Framework.Communications.Osp
164 "[OSP RESOLVER]: Adding temporary user profile for {0} {1}", tempUserProfile.Name, tempUserProfile.ID); 163 "[OSP RESOLVER]: Adding temporary user profile for {0} {1}", tempUserProfile.Name, tempUserProfile.ID);
165 commsManager.UserService.AddTemporaryUserProfile(tempUserProfile); 164 commsManager.UserService.AddTemporaryUserProfile(tempUserProfile);
166 165
167 return tempUserProfile.ID.ToString(); 166 return tempUserProfile.ID;
168 } 167 }
169 } 168 }
170} 169}