aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService
diff options
context:
space:
mode:
authorMelanie2010-07-02 04:03:35 +0100
committerDiva Canto2010-07-02 09:43:59 -0700
commit0abedae3e4be85698ce9f2568477ae4fb00a488d (patch)
treef00c79137e139dfdff24db61ee3af5085df5e6e6 /OpenSim/Services/LLLoginService
parentFix a dumb little sign error that makes a LSL wiki example fail (diff)
downloadopensim-SC_OLD-0abedae3e4be85698ce9f2568477ae4fb00a488d.zip
opensim-SC_OLD-0abedae3e4be85698ce9f2568477ae4fb00a488d.tar.gz
opensim-SC_OLD-0abedae3e4be85698ce9f2568477ae4fb00a488d.tar.bz2
opensim-SC_OLD-0abedae3e4be85698ce9f2568477ae4fb00a488d.tar.xz
Add MapTileURL to robust to supply the url needed by snowglobe
Diffstat (limited to 'OpenSim/Services/LLLoginService')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginResponse.cs19
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs4
2 files changed, 21 insertions, 2 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 54d53fb..866e3a3 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -170,6 +170,9 @@ namespace OpenSim.Services.LLLoginService
170 private string firstname; 170 private string firstname;
171 private string lastname; 171 private string lastname;
172 172
173 // Web map
174 private string mapTileURL;
175
173 // Error Flags 176 // Error Flags
174 private string errorReason; 177 private string errorReason;
175 private string errorMessage; 178 private string errorMessage;
@@ -218,7 +221,7 @@ namespace OpenSim.Services.LLLoginService
218 public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, 221 public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
219 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, 222 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
220 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, 223 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
221 GridRegion home, IPEndPoint clientIP) 224 GridRegion home, IPEndPoint clientIP, string mapTileURL)
222 : this() 225 : this()
223 { 226 {
224 FillOutInventoryData(invSkel, libService); 227 FillOutInventoryData(invSkel, libService);
@@ -234,6 +237,7 @@ namespace OpenSim.Services.LLLoginService
234 Message = message; 237 Message = message;
235 BuddList = ConvertFriendListItem(friendsList); 238 BuddList = ConvertFriendListItem(friendsList);
236 StartLocation = where; 239 StartLocation = where;
240 MapTileURL = mapTileURL;
237 241
238 FillOutHomeData(pinfo, home); 242 FillOutHomeData(pinfo, home);
239 LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z); 243 LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z);
@@ -405,6 +409,7 @@ namespace OpenSim.Services.LLLoginService
405 InitialOutfitHash["folder_name"] = "Nightclub Female"; 409 InitialOutfitHash["folder_name"] = "Nightclub Female";
406 InitialOutfitHash["gender"] = "female"; 410 InitialOutfitHash["gender"] = "female";
407 initialOutfit.Add(InitialOutfitHash); 411 initialOutfit.Add(InitialOutfitHash);
412 mapTileURL = String.Empty;
408 } 413 }
409 414
410 415
@@ -468,6 +473,9 @@ namespace OpenSim.Services.LLLoginService
468 responseData["region_x"] = (Int32)(RegionX); 473 responseData["region_x"] = (Int32)(RegionX);
469 responseData["region_y"] = (Int32)(RegionY); 474 responseData["region_y"] = (Int32)(RegionY);
470 475
476 if (mapTileURL != String.Empty)
477 responseData["map-server-url"] = mapTileURL;
478
471 if (m_buddyList != null) 479 if (m_buddyList != null)
472 { 480 {
473 responseData["buddy-list"] = m_buddyList.ToArray(); 481 responseData["buddy-list"] = m_buddyList.ToArray();
@@ -564,6 +572,9 @@ namespace OpenSim.Services.LLLoginService
564 map["region_x"] = OSD.FromInteger(RegionX); 572 map["region_x"] = OSD.FromInteger(RegionX);
565 map["region_y"] = OSD.FromInteger(RegionY); 573 map["region_y"] = OSD.FromInteger(RegionY);
566 574
575 if (mapTileURL != String.Empty)
576 map["map-server-url"] = OSD.FromString(mapTileURL);
577
567 if (m_buddyList != null) 578 if (m_buddyList != null)
568 { 579 {
569 map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray()); 580 map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray());
@@ -915,6 +926,12 @@ namespace OpenSim.Services.LLLoginService
915 set { home = value; } 926 set { home = value; }
916 } 927 }
917 928
929 public string MapTileURL
930 {
931 get { return mapTileURL; }
932 set { mapTileURL = value; }
933 }
934
918 public string Message 935 public string Message
919 { 936 {
920 get { return welcomeMessage; } 937 get { return welcomeMessage; }
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 00fffff..f4e045c 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -73,6 +73,7 @@ namespace OpenSim.Services.LLLoginService
73 protected int m_MinLoginLevel; 73 protected int m_MinLoginLevel;
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 77
77 IConfig m_LoginServerConfig; 78 IConfig m_LoginServerConfig;
78 79
@@ -100,6 +101,7 @@ namespace OpenSim.Services.LLLoginService
100 m_AllowRemoteSetLoginLevel = m_LoginServerConfig.GetBoolean("AllowRemoteSetLoginLevel", false); 101 m_AllowRemoteSetLoginLevel = m_LoginServerConfig.GetBoolean("AllowRemoteSetLoginLevel", false);
101 m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); 102 m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0);
102 m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); 103 m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty);
104 m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
103 105
104 // These are required; the others aren't 106 // These are required; the others aren't
105 if (accountService == string.Empty || authService == string.Empty) 107 if (accountService == string.Empty || authService == string.Empty)
@@ -356,7 +358,7 @@ namespace OpenSim.Services.LLLoginService
356 // Finally, fill out the response and return it 358 // Finally, fill out the response and return it
357 // 359 //
358 LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, 360 LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
359 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP); 361 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL);
360 362
361 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); 363 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
362 return response; 364 return response;