OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
0.7.4.1
BlueWall 2012-02-21 14:21:03 -05:00
parent a27e5a9c95
commit 7cf970fb27
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Services/LLLoginService/LLLoginResponse.cs
View File

@ -168,6 +168,9 @@ namespace OpenSim.Services.LLLoginService
// Web map
private string mapTileURL;
// Web Profiles
private string profileURL;
private string searchURL;
// Error Flags
@ -220,7 +223,7 @@ namespace OpenSim.Services.LLLoginService
public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency)
GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string searchURL, string currency)
: this()
{
FillOutInventoryData(invSkel, libService);
@ -237,6 +240,8 @@ namespace OpenSim.Services.LLLoginService
BuddList = ConvertFriendListItem(friendsList);
StartLocation = where;
MapTileURL = mapTileURL;
ProfileURL = profileURL;
SearchURL = searchURL;
Currency = currency;
@ -384,6 +389,7 @@ namespace OpenSim.Services.LLLoginService
InitialOutfitHash["gender"] = "female";
initialOutfit.Add(InitialOutfitHash);
mapTileURL = String.Empty;
profileURL = String.Empty;
searchURL = String.Empty;
currency = String.Empty;
@ -456,6 +462,9 @@ namespace OpenSim.Services.LLLoginService
if (mapTileURL != String.Empty)
responseData["map-server-url"] = mapTileURL;
if (profileURL != String.Empty)
responseData["profile-server-url"] = profileURL;
if (m_buddyList != null)
{
responseData["buddy-list"] = m_buddyList.ToArray();
@ -561,6 +570,9 @@ namespace OpenSim.Services.LLLoginService
if (mapTileURL != String.Empty)
map["map-server-url"] = OSD.FromString(mapTileURL);
if (profileURL != String.Empty)
map["profile-server-url"] = OSD.FromString(profileURL);
if (searchURL != String.Empty)
map["search"] = OSD.FromString(searchURL);
@ -933,6 +945,12 @@ namespace OpenSim.Services.LLLoginService
set { mapTileURL = value; }
}
public string ProfileURL
{
get { return profileURL; }
set { profileURL = value; }
}
public string SearchURL
{
get { return searchURL; }

4
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@ -74,6 +74,7 @@ namespace OpenSim.Services.LLLoginService
protected string m_GatekeeperURL;
protected bool m_AllowRemoteSetLoginLevel;
protected string m_MapTileURL;
protected string m_ProfileURL;
protected string m_SearchURL;
protected string m_Currency;
@ -108,6 +109,7 @@ namespace OpenSim.Services.LLLoginService
m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0);
m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty);
m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty);
m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty);
@ -413,7 +415,7 @@ namespace OpenSim.Services.LLLoginService
// Finally, fill out the response and return it
//
LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL, m_Currency);
where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_ProfileURL, m_SearchURL, m_Currency);
m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
return response;