Application support:

Adding some viwer supported url settings for destination guide and avatar picker apps. URL for the destinations should be: "secondlife:///app/teleport/slurl"
user_profiles
BlueWall 2013-05-09 10:46:37 -04:00
parent 543d1fe70b
commit 182ea00cb3
4 changed files with 37 additions and 2 deletions

View File

@ -227,7 +227,7 @@ namespace OpenSim.Services.LLLoginService
GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency, GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency,
string DSTZone) string DSTZone, string destinationsURL, string avatarsURL)
: this() : this()
{ {
FillOutInventoryData(invSkel, libService); FillOutInventoryData(invSkel, libService);
@ -246,6 +246,8 @@ namespace OpenSim.Services.LLLoginService
MapTileURL = mapTileURL; MapTileURL = mapTileURL;
ProfileURL = profileURL; ProfileURL = profileURL;
OpenIDURL = openIDURL; OpenIDURL = openIDURL;
DestinationsURL = destinationsURL;
AvatarsURL = avatarsURL;
SearchURL = searchURL; SearchURL = searchURL;
Currency = currency; Currency = currency;
@ -533,6 +535,12 @@ namespace OpenSim.Services.LLLoginService
if (profileURL != String.Empty) if (profileURL != String.Empty)
responseData["profile-server-url"] = profileURL; responseData["profile-server-url"] = profileURL;
if (DestinationsURL != String.Empty)
responseData["destination_guide_url"] = DestinationsURL;
if (AvatarsURL != String.Empty)
responseData["avatar_picker_url"] = AvatarsURL;
// We need to send an openid_token back in the response too // We need to send an openid_token back in the response too
if (openIDURL != String.Empty) if (openIDURL != String.Empty)
responseData["openid_url"] = openIDURL; responseData["openid_url"] = openIDURL;
@ -1056,6 +1064,16 @@ namespace OpenSim.Services.LLLoginService
set { currency = value; } set { currency = value; }
} }
public string DestinationsURL
{
get; set;
}
public string AvatarsURL
{
get; set;
}
#endregion #endregion
public class UserInfo public class UserInfo

View File

@ -78,6 +78,8 @@ namespace OpenSim.Services.LLLoginService
protected string m_OpenIDURL; protected string m_OpenIDURL;
protected string m_SearchURL; protected string m_SearchURL;
protected string m_Currency; protected string m_Currency;
protected string m_DestinationGuide;
protected string m_AvatarPicker;
protected string m_AllowedClients; protected string m_AllowedClients;
protected string m_DeniedClients; protected string m_DeniedClients;
@ -117,6 +119,8 @@ namespace OpenSim.Services.LLLoginService
m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty); m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty);
m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty);
m_DestinationGuide = m_LoginServerConfig.GetString ("DestinationGuide", string.Empty);
m_AvatarPicker = m_LoginServerConfig.GetString ("AvatarPicker", string.Empty);
m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty); m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty);
m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty); m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty);
@ -453,7 +457,8 @@ namespace OpenSim.Services.LLLoginService
= new LLLoginResponse( = new LLLoginResponse(
account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP,
m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone); m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone,
m_DestinationGuide, m_AvatarPicker);
m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName);

View File

@ -325,6 +325,12 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
; For V2/V3 webapp authentication SSO ; For V2/V3 webapp authentication SSO
; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/" ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
; For V3 destination guide
; DestinationGuide = "http://127.0.0.1/guide"
; For V3 avatar picker (( work in progress ))
; AvatarPicker = "http://127.0.0.1/avatars"
; If you run this login server behind a proxy, set this to true ; If you run this login server behind a proxy, set this to true
; HasProxy = false ; HasProxy = false

View File

@ -288,6 +288,12 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
; For V2/V3 webapp authentication SSO ; For V2/V3 webapp authentication SSO
; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/" ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
; For V3 destination guide
; DestinationGuide = "http://127.0.0.1/guide"
; For V3 avatar picker (( work in progress ))
; AvatarPicker = "http://127.0.0.1/avatars"
; If you run this login server behind a proxy, set this to true ; If you run this login server behind a proxy, set this to true
; HasProxy = false ; HasProxy = false