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

Add search URL to Login Service

0.7.0.1-release
Melanie 2010-08-07 22:24:17 +01:00 committed by Diva Canto
parent f30cd8391e
commit b0c86fea4c
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,6 +173,8 @@ namespace OpenSim.Services.LLLoginService
// Web map
private string mapTileURL;
private string searchURL;
// Error Flags
private string errorReason;
private string errorMessage;
@ -221,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)
GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL)
: this()
{
FillOutInventoryData(invSkel, libService);
@ -238,6 +240,7 @@ namespace OpenSim.Services.LLLoginService
BuddList = ConvertFriendListItem(friendsList);
StartLocation = where;
MapTileURL = mapTileURL;
SearchURL = searchURL;
FillOutHomeData(pinfo, home);
LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z);
@ -410,6 +413,7 @@ namespace OpenSim.Services.LLLoginService
InitialOutfitHash["gender"] = "female";
initialOutfit.Add(InitialOutfitHash);
mapTileURL = String.Empty;
searchURL = String.Empty;
}
@ -473,6 +477,9 @@ namespace OpenSim.Services.LLLoginService
responseData["region_x"] = (Int32)(RegionX);
responseData["region_y"] = (Int32)(RegionY);
if (searchURL != String.Empty)
responseData["search"] = searchURL;
if (mapTileURL != String.Empty)
responseData["map-server-url"] = mapTileURL;
@ -575,6 +582,9 @@ namespace OpenSim.Services.LLLoginService
if (mapTileURL != String.Empty)
map["map-server-url"] = OSD.FromString(mapTileURL);
if (searchURL != String.Empty)
map["search"] = OSD.FromString(searchURL);
if (m_buddyList != null)
{
map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray());
@ -932,6 +942,12 @@ namespace OpenSim.Services.LLLoginService
set { mapTileURL = value; }
}
public string SearchURL
{
get { return searchURL; }
set { searchURL = value; }
}
public string Message
{
get { return welcomeMessage; }

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_SearchURL;
IConfig m_LoginServerConfig;
@ -102,6 +103,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_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
// These are required; the others aren't
if (accountService == string.Empty || authService == string.Empty)
@ -358,7 +360,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);
where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL);
m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
return response;