aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorSnoopy Pfeffer2011-08-14 18:20:20 +0200
committerSnoopy Pfeffer2011-08-14 18:20:20 +0200
commit70ea62544716134447884e999898267497b85a12 (patch)
tree5e2029fc671ca0c9da12fa5533ce0b2bdb378f74 /OpenSim
parentWorldMap: Added map item for Land-for-Sale. Implemented backlist item timeout... (diff)
downloadopensim-SC_OLD-70ea62544716134447884e999898267497b85a12.zip
opensim-SC_OLD-70ea62544716134447884e999898267497b85a12.tar.gz
opensim-SC_OLD-70ea62544716134447884e999898267497b85a12.tar.bz2
opensim-SC_OLD-70ea62544716134447884e999898267497b85a12.tar.xz
Added optional Login Service parameter "Currency" to be able to change the currency name shown in the viewer.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginResponse.cs19
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs4
2 files changed, 21 insertions, 2 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index f68c078..1a874c8 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -183,6 +183,8 @@ namespace OpenSim.Services.LLLoginService
183 183
184 private BuddyList m_buddyList = null; 184 private BuddyList m_buddyList = null;
185 185
186 private string currency;
187
186 static LLLoginResponse() 188 static LLLoginResponse()
187 { 189 {
188 // This is being set, but it's not used 190 // This is being set, but it's not used
@@ -218,7 +220,7 @@ namespace OpenSim.Services.LLLoginService
218 public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, 220 public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
219 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, 221 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
220 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, 222 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
221 GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL) 223 GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency)
222 : this() 224 : this()
223 { 225 {
224 FillOutInventoryData(invSkel, libService); 226 FillOutInventoryData(invSkel, libService);
@@ -236,6 +238,7 @@ namespace OpenSim.Services.LLLoginService
236 StartLocation = where; 238 StartLocation = where;
237 MapTileURL = mapTileURL; 239 MapTileURL = mapTileURL;
238 SearchURL = searchURL; 240 SearchURL = searchURL;
241 Currency = currency;
239 242
240 FillOutHomeData(pinfo, home); 243 FillOutHomeData(pinfo, home);
241 LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z); 244 LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z);
@@ -382,6 +385,8 @@ namespace OpenSim.Services.LLLoginService
382 initialOutfit.Add(InitialOutfitHash); 385 initialOutfit.Add(InitialOutfitHash);
383 mapTileURL = String.Empty; 386 mapTileURL = String.Empty;
384 searchURL = String.Empty; 387 searchURL = String.Empty;
388
389 currency = String.Empty;
385 } 390 }
386 391
387 392
@@ -456,6 +461,12 @@ namespace OpenSim.Services.LLLoginService
456 responseData["buddy-list"] = m_buddyList.ToArray(); 461 responseData["buddy-list"] = m_buddyList.ToArray();
457 } 462 }
458 463
464 if (currency != String.Empty)
465 {
466 // responseData["real_currency"] = currency;
467 responseData["currency"] = currency;
468 }
469
459 responseData["login"] = "true"; 470 responseData["login"] = "true";
460 471
461 return responseData; 472 return responseData;
@@ -940,6 +951,12 @@ namespace OpenSim.Services.LLLoginService
940 set { m_buddyList = value; } 951 set { m_buddyList = value; }
941 } 952 }
942 953
954 public string Currency
955 {
956 get { return currency; }
957 set { currency = value; }
958 }
959
943 #endregion 960 #endregion
944 961
945 public class UserInfo 962 public class UserInfo
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 00405a1..4ccc7ff 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -75,6 +75,7 @@ namespace OpenSim.Services.LLLoginService
75 protected bool m_AllowRemoteSetLoginLevel; 75 protected bool m_AllowRemoteSetLoginLevel;
76 protected string m_MapTileURL; 76 protected string m_MapTileURL;
77 protected string m_SearchURL; 77 protected string m_SearchURL;
78 protected string m_Currency;
78 79
79 protected string m_AllowedClients; 80 protected string m_AllowedClients;
80 protected string m_DeniedClients; 81 protected string m_DeniedClients;
@@ -108,6 +109,7 @@ namespace OpenSim.Services.LLLoginService
108 m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); 109 m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty);
109 m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); 110 m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
110 m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); 111 m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
112 m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty);
111 113
112 m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty); 114 m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty);
113 m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty); 115 m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty);
@@ -408,7 +410,7 @@ namespace OpenSim.Services.LLLoginService
408 // Finally, fill out the response and return it 410 // Finally, fill out the response and return it
409 // 411 //
410 LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, 412 LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
411 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL); 413 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL, m_Currency);
412 414
413 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); 415 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
414 return response; 416 return response;