aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorBlueWall2012-02-21 14:21:03 -0500
committerBlueWall2012-02-21 14:21:03 -0500
commit7cf970fb27297d9550d4bdb1d520e9c6ff0a381d (patch)
treeb89bb60e9e90518b63f58b0067d68a9d07e41fa1 /OpenSim/Services
parentBoth 32-bit and 64-bit BulletSim.dll must have the same name. Rename the 64 ... (diff)
downloadopensim-SC_OLD-7cf970fb27297d9550d4bdb1d520e9c6ff0a381d.zip
opensim-SC_OLD-7cf970fb27297d9550d4bdb1d520e9c6ff0a381d.tar.gz
opensim-SC_OLD-7cf970fb27297d9550d4bdb1d520e9c6ff0a381d.tar.bz2
opensim-SC_OLD-7cf970fb27297d9550d4bdb1d520e9c6ff0a381d.tar.xz
V3 Support:
This starts V3 support by adding a profile server url to the login response. This requires viewer support - which is also being worked on.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginResponse.cs20
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs4
2 files changed, 22 insertions, 2 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 1a874c8..b6f6d31 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -168,6 +168,9 @@ 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
171 private string searchURL; 174 private string searchURL;
172 175
173 // Error Flags 176 // Error Flags
@@ -220,7 +223,7 @@ namespace OpenSim.Services.LLLoginService
220 public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, 223 public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
221 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, 224 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
222 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, 225 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
223 GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency) 226 GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string searchURL, string currency)
224 : this() 227 : this()
225 { 228 {
226 FillOutInventoryData(invSkel, libService); 229 FillOutInventoryData(invSkel, libService);
@@ -237,6 +240,8 @@ namespace OpenSim.Services.LLLoginService
237 BuddList = ConvertFriendListItem(friendsList); 240 BuddList = ConvertFriendListItem(friendsList);
238 StartLocation = where; 241 StartLocation = where;
239 MapTileURL = mapTileURL; 242 MapTileURL = mapTileURL;
243 ProfileURL = profileURL;
244
240 SearchURL = searchURL; 245 SearchURL = searchURL;
241 Currency = currency; 246 Currency = currency;
242 247
@@ -384,6 +389,7 @@ namespace OpenSim.Services.LLLoginService
384 InitialOutfitHash["gender"] = "female"; 389 InitialOutfitHash["gender"] = "female";
385 initialOutfit.Add(InitialOutfitHash); 390 initialOutfit.Add(InitialOutfitHash);
386 mapTileURL = String.Empty; 391 mapTileURL = String.Empty;
392 profileURL = String.Empty;
387 searchURL = String.Empty; 393 searchURL = String.Empty;
388 394
389 currency = String.Empty; 395 currency = String.Empty;
@@ -456,6 +462,9 @@ namespace OpenSim.Services.LLLoginService
456 if (mapTileURL != String.Empty) 462 if (mapTileURL != String.Empty)
457 responseData["map-server-url"] = mapTileURL; 463 responseData["map-server-url"] = mapTileURL;
458 464
465 if (profileURL != String.Empty)
466 responseData["profile-server-url"] = profileURL;
467
459 if (m_buddyList != null) 468 if (m_buddyList != null)
460 { 469 {
461 responseData["buddy-list"] = m_buddyList.ToArray(); 470 responseData["buddy-list"] = m_buddyList.ToArray();
@@ -561,6 +570,9 @@ namespace OpenSim.Services.LLLoginService
561 if (mapTileURL != String.Empty) 570 if (mapTileURL != String.Empty)
562 map["map-server-url"] = OSD.FromString(mapTileURL); 571 map["map-server-url"] = OSD.FromString(mapTileURL);
563 572
573 if (profileURL != String.Empty)
574 map["profile-server-url"] = OSD.FromString(profileURL);
575
564 if (searchURL != String.Empty) 576 if (searchURL != String.Empty)
565 map["search"] = OSD.FromString(searchURL); 577 map["search"] = OSD.FromString(searchURL);
566 578
@@ -933,6 +945,12 @@ namespace OpenSim.Services.LLLoginService
933 set { mapTileURL = value; } 945 set { mapTileURL = value; }
934 } 946 }
935 947
948 public string ProfileURL
949 {
950 get { return profileURL; }
951 set { profileURL = value; }
952 }
953
936 public string SearchURL 954 public string SearchURL
937 { 955 {
938 get { return searchURL; } 956 get { return searchURL; }
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 5dff512..02e62c8 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -74,6 +74,7 @@ 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;
77 protected string m_SearchURL; 78 protected string m_SearchURL;
78 protected string m_Currency; 79 protected string m_Currency;
79 80
@@ -108,6 +109,7 @@ namespace OpenSim.Services.LLLoginService
108 m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); 109 m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0);
109 m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); 110 m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty);
110 m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); 111 m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
112 m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty);
111 m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); 113 m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
112 m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); 114 m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty);
113 115
@@ -413,7 +415,7 @@ namespace OpenSim.Services.LLLoginService
413 // Finally, fill out the response and return it 415 // Finally, fill out the response and return it
414 // 416 //
415 LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, 417 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); 418 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_ProfileURL, m_SearchURL, m_Currency);
417 419
418 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); 420 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
419 return response; 421 return response;