aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginResponse.cs38
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs6
2 files changed, 42 insertions, 2 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 1a874c8..844c5ae 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -168,6 +168,12 @@ namespace OpenSim.Services.LLLoginService
168 // Web map 168 // Web map
169 private string mapTileURL; 169 private string mapTileURL;
170 170
171 // Web Profiles
172 private string profileURL;
173
174 // OpenID
175 private string openIDURL;
176
171 private string searchURL; 177 private string searchURL;
172 178
173 // Error Flags 179 // Error Flags
@@ -220,7 +226,7 @@ namespace OpenSim.Services.LLLoginService
220 public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, 226 public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
221 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, 227 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
222 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, 228 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
223 GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency) 229 GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency)
224 : this() 230 : this()
225 { 231 {
226 FillOutInventoryData(invSkel, libService); 232 FillOutInventoryData(invSkel, libService);
@@ -237,6 +243,9 @@ namespace OpenSim.Services.LLLoginService
237 BuddList = ConvertFriendListItem(friendsList); 243 BuddList = ConvertFriendListItem(friendsList);
238 StartLocation = where; 244 StartLocation = where;
239 MapTileURL = mapTileURL; 245 MapTileURL = mapTileURL;
246 ProfileURL = profileURL;
247 OpenIDURL = openIDURL;
248
240 SearchURL = searchURL; 249 SearchURL = searchURL;
241 Currency = currency; 250 Currency = currency;
242 251
@@ -384,6 +393,8 @@ namespace OpenSim.Services.LLLoginService
384 InitialOutfitHash["gender"] = "female"; 393 InitialOutfitHash["gender"] = "female";
385 initialOutfit.Add(InitialOutfitHash); 394 initialOutfit.Add(InitialOutfitHash);
386 mapTileURL = String.Empty; 395 mapTileURL = String.Empty;
396 profileURL = String.Empty;
397 openIDURL = String.Empty;
387 searchURL = String.Empty; 398 searchURL = String.Empty;
388 399
389 currency = String.Empty; 400 currency = String.Empty;
@@ -456,6 +467,13 @@ namespace OpenSim.Services.LLLoginService
456 if (mapTileURL != String.Empty) 467 if (mapTileURL != String.Empty)
457 responseData["map-server-url"] = mapTileURL; 468 responseData["map-server-url"] = mapTileURL;
458 469
470 if (profileURL != String.Empty)
471 responseData["profile-server-url"] = profileURL;
472
473 // We need to send an openid_token back in the response too
474 if (openIDURL != String.Empty)
475 responseData["openid_url"] = openIDURL;
476
459 if (m_buddyList != null) 477 if (m_buddyList != null)
460 { 478 {
461 responseData["buddy-list"] = m_buddyList.ToArray(); 479 responseData["buddy-list"] = m_buddyList.ToArray();
@@ -561,6 +579,12 @@ namespace OpenSim.Services.LLLoginService
561 if (mapTileURL != String.Empty) 579 if (mapTileURL != String.Empty)
562 map["map-server-url"] = OSD.FromString(mapTileURL); 580 map["map-server-url"] = OSD.FromString(mapTileURL);
563 581
582 if (profileURL != String.Empty)
583 map["profile-server-url"] = OSD.FromString(profileURL);
584
585 if (openIDURL != String.Empty)
586 map["openid_url"] = OSD.FromString(openIDURL);
587
564 if (searchURL != String.Empty) 588 if (searchURL != String.Empty)
565 map["search"] = OSD.FromString(searchURL); 589 map["search"] = OSD.FromString(searchURL);
566 590
@@ -933,6 +957,18 @@ namespace OpenSim.Services.LLLoginService
933 set { mapTileURL = value; } 957 set { mapTileURL = value; }
934 } 958 }
935 959
960 public string ProfileURL
961 {
962 get { return profileURL; }
963 set { profileURL = value; }
964 }
965
966 public string OpenIDURL
967 {
968 get { return openIDURL; }
969 set { openIDURL = value; }
970 }
971
936 public string SearchURL 972 public string SearchURL
937 { 973 {
938 get { return searchURL; } 974 get { return searchURL; }
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 5dff512..f7b38d4 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -74,6 +74,8 @@ namespace OpenSim.Services.LLLoginService
74 protected string m_GatekeeperURL; 74 protected string m_GatekeeperURL;
75 protected bool m_AllowRemoteSetLoginLevel; 75 protected bool m_AllowRemoteSetLoginLevel;
76 protected string m_MapTileURL; 76 protected string m_MapTileURL;
77 protected string m_ProfileURL;
78 protected string m_OpenIDURL;
77 protected string m_SearchURL; 79 protected string m_SearchURL;
78 protected string m_Currency; 80 protected string m_Currency;
79 81
@@ -108,6 +110,8 @@ namespace OpenSim.Services.LLLoginService
108 m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); 110 m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0);
109 m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); 111 m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty);
110 m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); 112 m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
113 m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty);
114 m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty);
111 m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); 115 m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
112 m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); 116 m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty);
113 117
@@ -413,7 +417,7 @@ namespace OpenSim.Services.LLLoginService
413 // Finally, fill out the response and return it 417 // Finally, fill out the response and return it
414 // 418 //
415 LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, 419 LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
416 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL, m_Currency); 420 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency);
417 421
418 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); 422 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
419 return response; 423 return response;