diff options
author | BlueWall | 2013-06-13 09:18:27 -0400 |
---|---|---|
committer | BlueWall | 2013-06-13 09:18:27 -0400 |
commit | b2c8d5eec7cc5c6b4685d22921a6e684ce7714b1 (patch) | |
tree | a187ce4022030ff0efe82b622e4dca1e535fd49b /OpenSim | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-b2c8d5eec7cc5c6b4685d22921a6e684ce7714b1.zip opensim-SC-b2c8d5eec7cc5c6b4685d22921a6e684ce7714b1.tar.gz opensim-SC-b2c8d5eec7cc5c6b4685d22921a6e684ce7714b1.tar.bz2 opensim-SC-b2c8d5eec7cc5c6b4685d22921a6e684ce7714b1.tar.xz |
Add Option: ClassifiedFee
Add option to set minimum fee for publishing classifieds. Many viewers have a
hard coded minimum of 50, which makes publishing classifieds fail where grids
have no economy. This allows the grid to set the minimum fee to a suitable
value for their operation.
The option is located in the [LoginService] section and defaults to 0. The
value is sent as "classified_fee" in the login response.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginResponse.cs | 18 | ||||
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 4 |
2 files changed, 20 insertions, 2 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index 400f303..6ab5258 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -190,6 +190,7 @@ namespace OpenSim.Services.LLLoginService | |||
190 | private BuddyList m_buddyList = null; | 190 | private BuddyList m_buddyList = null; |
191 | 191 | ||
192 | private string currency; | 192 | private string currency; |
193 | private string classifiedFee; | ||
193 | 194 | ||
194 | static LLLoginResponse() | 195 | static LLLoginResponse() |
195 | { | 196 | { |
@@ -227,7 +228,7 @@ namespace OpenSim.Services.LLLoginService | |||
227 | GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, | 228 | GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, |
228 | string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, | 229 | string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, |
229 | GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency, | 230 | GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency, |
230 | string DSTZone, string destinationsURL, string avatarsURL) | 231 | string DSTZone, string destinationsURL, string avatarsURL, string classifiedFee) |
231 | : this() | 232 | : this() |
232 | { | 233 | { |
233 | FillOutInventoryData(invSkel, libService); | 234 | FillOutInventoryData(invSkel, libService); |
@@ -251,6 +252,8 @@ namespace OpenSim.Services.LLLoginService | |||
251 | 252 | ||
252 | SearchURL = searchURL; | 253 | SearchURL = searchURL; |
253 | Currency = currency; | 254 | Currency = currency; |
255 | ClassifiedFee = classifiedFee; | ||
256 | |||
254 | 257 | ||
255 | FillOutHomeData(pinfo, home); | 258 | FillOutHomeData(pinfo, home); |
256 | LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z); | 259 | LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z); |
@@ -463,6 +466,7 @@ namespace OpenSim.Services.LLLoginService | |||
463 | searchURL = String.Empty; | 466 | searchURL = String.Empty; |
464 | 467 | ||
465 | currency = String.Empty; | 468 | currency = String.Empty; |
469 | ClassifiedFee = "0"; | ||
466 | } | 470 | } |
467 | 471 | ||
468 | 472 | ||
@@ -555,6 +559,9 @@ namespace OpenSim.Services.LLLoginService | |||
555 | // responseData["real_currency"] = currency; | 559 | // responseData["real_currency"] = currency; |
556 | responseData["currency"] = currency; | 560 | responseData["currency"] = currency; |
557 | } | 561 | } |
562 | |||
563 | if (ClassifiedFee != String.Empty) | ||
564 | responseData["classified_fee"] = ClassifiedFee; | ||
558 | 565 | ||
559 | responseData["login"] = "true"; | 566 | responseData["login"] = "true"; |
560 | 567 | ||
@@ -659,6 +666,9 @@ namespace OpenSim.Services.LLLoginService | |||
659 | if (searchURL != String.Empty) | 666 | if (searchURL != String.Empty) |
660 | map["search"] = OSD.FromString(searchURL); | 667 | map["search"] = OSD.FromString(searchURL); |
661 | 668 | ||
669 | if (ClassifiedFee != String.Empty) | ||
670 | map["classified_fee"] = OSD.FromString(ClassifiedFee); | ||
671 | |||
662 | if (m_buddyList != null) | 672 | if (m_buddyList != null) |
663 | { | 673 | { |
664 | map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray()); | 674 | map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray()); |
@@ -1064,6 +1074,12 @@ namespace OpenSim.Services.LLLoginService | |||
1064 | set { currency = value; } | 1074 | set { currency = value; } |
1065 | } | 1075 | } |
1066 | 1076 | ||
1077 | public string ClassifiedFee | ||
1078 | { | ||
1079 | get { return classifiedFee; } | ||
1080 | set { classifiedFee = value; } | ||
1081 | } | ||
1082 | |||
1067 | public string DestinationsURL | 1083 | public string DestinationsURL |
1068 | { | 1084 | { |
1069 | get; set; | 1085 | get; set; |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index abda98f..10cf90f 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 | ||
@@ -458,7 +460,7 @@ namespace OpenSim.Services.LLLoginService | |||
458 | account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, | 460 | account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, |
459 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, | 461 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, |
460 | m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone, | 462 | m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone, |
461 | m_DestinationGuide, m_AvatarPicker); | 463 | m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee); |
462 | 464 | ||
463 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); | 465 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); |
464 | 466 | ||