Added optional Login Service parameter "Currency" to be able to change the currency name shown in the viewer.
parent
e19843a0ee
commit
70ea625447
|
@ -183,6 +183,8 @@ namespace OpenSim.Services.LLLoginService
|
||||||
|
|
||||||
private BuddyList m_buddyList = null;
|
private BuddyList m_buddyList = null;
|
||||||
|
|
||||||
|
private string currency;
|
||||||
|
|
||||||
static LLLoginResponse()
|
static LLLoginResponse()
|
||||||
{
|
{
|
||||||
// This is being set, but it's not used
|
// This is being set, but it's not used
|
||||||
|
@ -218,7 +220,7 @@ namespace OpenSim.Services.LLLoginService
|
||||||
public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
|
public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
|
||||||
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 searchURL)
|
GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency)
|
||||||
: this()
|
: this()
|
||||||
{
|
{
|
||||||
FillOutInventoryData(invSkel, libService);
|
FillOutInventoryData(invSkel, libService);
|
||||||
|
@ -236,6 +238,7 @@ namespace OpenSim.Services.LLLoginService
|
||||||
StartLocation = where;
|
StartLocation = where;
|
||||||
MapTileURL = mapTileURL;
|
MapTileURL = mapTileURL;
|
||||||
SearchURL = searchURL;
|
SearchURL = searchURL;
|
||||||
|
Currency = currency;
|
||||||
|
|
||||||
FillOutHomeData(pinfo, home);
|
FillOutHomeData(pinfo, home);
|
||||||
LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z);
|
LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z);
|
||||||
|
@ -382,6 +385,8 @@ namespace OpenSim.Services.LLLoginService
|
||||||
initialOutfit.Add(InitialOutfitHash);
|
initialOutfit.Add(InitialOutfitHash);
|
||||||
mapTileURL = String.Empty;
|
mapTileURL = String.Empty;
|
||||||
searchURL = String.Empty;
|
searchURL = String.Empty;
|
||||||
|
|
||||||
|
currency = String.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -456,6 +461,12 @@ namespace OpenSim.Services.LLLoginService
|
||||||
responseData["buddy-list"] = m_buddyList.ToArray();
|
responseData["buddy-list"] = m_buddyList.ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (currency != String.Empty)
|
||||||
|
{
|
||||||
|
// responseData["real_currency"] = currency;
|
||||||
|
responseData["currency"] = currency;
|
||||||
|
}
|
||||||
|
|
||||||
responseData["login"] = "true";
|
responseData["login"] = "true";
|
||||||
|
|
||||||
return responseData;
|
return responseData;
|
||||||
|
@ -940,6 +951,12 @@ namespace OpenSim.Services.LLLoginService
|
||||||
set { m_buddyList = value; }
|
set { m_buddyList = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string Currency
|
||||||
|
{
|
||||||
|
get { return currency; }
|
||||||
|
set { currency = value; }
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
public class UserInfo
|
public class UserInfo
|
||||||
|
|
|
@ -75,6 +75,7 @@ namespace OpenSim.Services.LLLoginService
|
||||||
protected bool m_AllowRemoteSetLoginLevel;
|
protected bool m_AllowRemoteSetLoginLevel;
|
||||||
protected string m_MapTileURL;
|
protected string m_MapTileURL;
|
||||||
protected string m_SearchURL;
|
protected string m_SearchURL;
|
||||||
|
protected string m_Currency;
|
||||||
|
|
||||||
protected string m_AllowedClients;
|
protected string m_AllowedClients;
|
||||||
protected string m_DeniedClients;
|
protected string m_DeniedClients;
|
||||||
|
@ -108,6 +109,7 @@ namespace OpenSim.Services.LLLoginService
|
||||||
m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty);
|
m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty);
|
||||||
m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
|
m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", 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_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);
|
||||||
|
@ -408,7 +410,7 @@ namespace OpenSim.Services.LLLoginService
|
||||||
// Finally, fill out the response and return it
|
// Finally, fill out the response and return it
|
||||||
//
|
//
|
||||||
LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
|
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);
|
where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL, m_Currency);
|
||||||
|
|
||||||
m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
|
m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
|
||||||
return response;
|
return response;
|
||||||
|
|
|
@ -203,6 +203,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
|
||||||
UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
|
UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
|
||||||
FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
|
FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
|
||||||
|
|
||||||
|
;Currency = ""
|
||||||
|
|
||||||
WelcomeMessage = "Welcome, Avatar!"
|
WelcomeMessage = "Welcome, Avatar!"
|
||||||
AllowRemoteSetLoginLevel = "false"
|
AllowRemoteSetLoginLevel = "false"
|
||||||
|
|
||||||
|
|
|
@ -188,6 +188,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
|
||||||
LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService"
|
LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService"
|
||||||
FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
|
FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
|
||||||
|
|
||||||
|
;Currency = ""
|
||||||
|
|
||||||
WelcomeMessage = "Welcome, Avatar!"
|
WelcomeMessage = "Welcome, Avatar!"
|
||||||
AllowRemoteSetLoginLevel = "false"
|
AllowRemoteSetLoginLevel = "false"
|
||||||
|
|
||||||
|
|
|
@ -99,6 +99,8 @@
|
||||||
;; For Viewer 2
|
;; For Viewer 2
|
||||||
MapTileURL = "http://127.0.0.1:9000/"
|
MapTileURL = "http://127.0.0.1:9000/"
|
||||||
|
|
||||||
|
;Currency = ""
|
||||||
|
|
||||||
;; Regular expressions for controlling which client versions are accepted/denied.
|
;; Regular expressions for controlling which client versions are accepted/denied.
|
||||||
;; An empty string means nothing is checked.
|
;; An empty string means nothing is checked.
|
||||||
;;
|
;;
|
||||||
|
|
Loading…
Reference in New Issue