aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginResponse.cs18
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs4
2 files changed, 20 insertions, 2 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index da6c016..057c492 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -196,6 +196,7 @@ namespace OpenSim.Services.LLLoginService
196 private BuddyList m_buddyList = null; 196 private BuddyList m_buddyList = null;
197 197
198 private string currency; 198 private string currency;
199 private string classifiedFee;
199 200
200 static LLLoginResponse() 201 static LLLoginResponse()
201 { 202 {
@@ -233,7 +234,7 @@ namespace OpenSim.Services.LLLoginService
233 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, 234 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
234 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, 235 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
235 GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency, 236 GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency,
236 string DSTZone, string destinationsURL, string avatarsURL, UUID realID) 237 string DSTZone, string destinationsURL, string avatarsURL, UUID realID, string classifiedFee)
237 : this() 238 : this()
238 { 239 {
239 FillOutInventoryData(invSkel, libService); 240 FillOutInventoryData(invSkel, libService);
@@ -258,6 +259,8 @@ namespace OpenSim.Services.LLLoginService
258 259
259 SearchURL = searchURL; 260 SearchURL = searchURL;
260 Currency = currency; 261 Currency = currency;
262 ClassifiedFee = classifiedFee;
263
261 264
262 FillOutHomeData(pinfo, home); 265 FillOutHomeData(pinfo, home);
263 LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z); 266 LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z);
@@ -472,6 +475,7 @@ namespace OpenSim.Services.LLLoginService
472 searchURL = String.Empty; 475 searchURL = String.Empty;
473 476
474 currency = String.Empty; 477 currency = String.Empty;
478 ClassifiedFee = "0";
475 } 479 }
476 480
477 481
@@ -565,6 +569,9 @@ namespace OpenSim.Services.LLLoginService
565 // responseData["real_currency"] = currency; 569 // responseData["real_currency"] = currency;
566 responseData["currency"] = currency; 570 responseData["currency"] = currency;
567 } 571 }
572
573 if (ClassifiedFee != String.Empty)
574 responseData["classified_fee"] = ClassifiedFee;
568 575
569 responseData["login"] = "true"; 576 responseData["login"] = "true";
570 577
@@ -670,6 +677,9 @@ namespace OpenSim.Services.LLLoginService
670 if (searchURL != String.Empty) 677 if (searchURL != String.Empty)
671 map["search"] = OSD.FromString(searchURL); 678 map["search"] = OSD.FromString(searchURL);
672 679
680 if (ClassifiedFee != String.Empty)
681 map["classified_fee"] = OSD.FromString(ClassifiedFee);
682
673 if (m_buddyList != null) 683 if (m_buddyList != null)
674 { 684 {
675 map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray()); 685 map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray());
@@ -1081,6 +1091,12 @@ namespace OpenSim.Services.LLLoginService
1081 set { currency = value; } 1091 set { currency = value; }
1082 } 1092 }
1083 1093
1094 public string ClassifiedFee
1095 {
1096 get { return classifiedFee; }
1097 set { classifiedFee = value; }
1098 }
1099
1084 public string DestinationsURL 1100 public string DestinationsURL
1085 { 1101 {
1086 get; set; 1102 get; set;
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 351c1ac..81712f6 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -78,6 +78,7 @@ namespace OpenSim.Services.LLLoginService
78 protected string m_OpenIDURL; 78 protected string m_OpenIDURL;
79 protected string m_SearchURL; 79 protected string m_SearchURL;
80 protected string m_Currency; 80 protected string m_Currency;
81 protected string m_ClassifiedFee;
81 protected string m_DestinationGuide; 82 protected string m_DestinationGuide;
82 protected string m_AvatarPicker; 83 protected string m_AvatarPicker;
83 84
@@ -119,6 +120,7 @@ namespace OpenSim.Services.LLLoginService
119 m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty); 120 m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty);
120 m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); 121 m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
121 m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); 122 m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty);
123 m_ClassifiedFee = m_LoginServerConfig.GetString("ClassifiedFee", string.Empty);
122 m_DestinationGuide = m_LoginServerConfig.GetString ("DestinationGuide", string.Empty); 124 m_DestinationGuide = m_LoginServerConfig.GetString ("DestinationGuide", string.Empty);
123 m_AvatarPicker = m_LoginServerConfig.GetString ("AvatarPicker", string.Empty); 125 m_AvatarPicker = m_LoginServerConfig.GetString ("AvatarPicker", string.Empty);
124 126
@@ -466,7 +468,7 @@ namespace OpenSim.Services.LLLoginService
466 account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, 468 account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
467 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, 469 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP,
468 m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone, 470 m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone,
469 m_DestinationGuide, m_AvatarPicker, realID); 471 m_DestinationGuide, m_AvatarPicker, realID, m_ClassifiedFee);
470 472
471 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); 473 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName);
472 474