diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginResponse.cs | 13 | ||||
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 8 |
2 files changed, 19 insertions, 2 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index 27376cc..fdf89be 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -191,6 +191,7 @@ namespace OpenSim.Services.LLLoginService | |||
191 | 191 | ||
192 | private string currency; | 192 | private string currency; |
193 | private string classifiedFee; | 193 | private string classifiedFee; |
194 | private int maxAgentGroups; | ||
194 | 195 | ||
195 | static LLLoginResponse() | 196 | static LLLoginResponse() |
196 | { | 197 | { |
@@ -228,7 +229,7 @@ namespace OpenSim.Services.LLLoginService | |||
228 | GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, | 229 | GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, |
229 | string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, | 230 | string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, |
230 | GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency, | 231 | GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency, |
231 | string DSTZone, string destinationsURL, string avatarsURL, string classifiedFee) | 232 | string DSTZone, string destinationsURL, string avatarsURL, string classifiedFee, int maxAgentGroups) |
232 | : this() | 233 | : this() |
233 | { | 234 | { |
234 | FillOutInventoryData(invSkel, libService); | 235 | FillOutInventoryData(invSkel, libService); |
@@ -253,6 +254,7 @@ namespace OpenSim.Services.LLLoginService | |||
253 | SearchURL = searchURL; | 254 | SearchURL = searchURL; |
254 | Currency = currency; | 255 | Currency = currency; |
255 | ClassifiedFee = classifiedFee; | 256 | ClassifiedFee = classifiedFee; |
257 | MaxAgentGroups = maxAgentGroups; | ||
256 | 258 | ||
257 | FillOutHomeData(pinfo, home); | 259 | FillOutHomeData(pinfo, home); |
258 | LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z); | 260 | LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z); |
@@ -483,6 +485,7 @@ namespace OpenSim.Services.LLLoginService | |||
483 | 485 | ||
484 | currency = String.Empty; | 486 | currency = String.Empty; |
485 | ClassifiedFee = "0"; | 487 | ClassifiedFee = "0"; |
488 | MaxAgentGroups = 42; | ||
486 | } | 489 | } |
487 | 490 | ||
488 | 491 | ||
@@ -542,6 +545,7 @@ namespace OpenSim.Services.LLLoginService | |||
542 | responseData["seed_capability"] = seedCapability; | 545 | responseData["seed_capability"] = seedCapability; |
543 | responseData["home"] = home; | 546 | responseData["home"] = home; |
544 | responseData["look_at"] = lookAt; | 547 | responseData["look_at"] = lookAt; |
548 | responseData["max-agent-groups"] = MaxAgentGroups; | ||
545 | responseData["message"] = welcomeMessage; | 549 | responseData["message"] = welcomeMessage; |
546 | responseData["region_x"] = (Int32)(RegionX); | 550 | responseData["region_x"] = (Int32)(RegionX); |
547 | responseData["region_y"] = (Int32)(RegionY); | 551 | responseData["region_y"] = (Int32)(RegionY); |
@@ -669,6 +673,7 @@ namespace OpenSim.Services.LLLoginService | |||
669 | map["seed_capability"] = OSD.FromString(seedCapability); | 673 | map["seed_capability"] = OSD.FromString(seedCapability); |
670 | map["home"] = OSD.FromString(home); | 674 | map["home"] = OSD.FromString(home); |
671 | map["look_at"] = OSD.FromString(lookAt); | 675 | map["look_at"] = OSD.FromString(lookAt); |
676 | map["max-agent-groups"] = OSD.FromInteger(MaxAgentGroups); | ||
672 | map["message"] = OSD.FromString(welcomeMessage); | 677 | map["message"] = OSD.FromString(welcomeMessage); |
673 | map["region_x"] = OSD.FromInteger(RegionX); | 678 | map["region_x"] = OSD.FromInteger(RegionX); |
674 | map["region_y"] = OSD.FromInteger(RegionY); | 679 | map["region_y"] = OSD.FromInteger(RegionY); |
@@ -1102,6 +1107,12 @@ namespace OpenSim.Services.LLLoginService | |||
1102 | set { classifiedFee = value; } | 1107 | set { classifiedFee = value; } |
1103 | } | 1108 | } |
1104 | 1109 | ||
1110 | public int MaxAgentGroups | ||
1111 | { | ||
1112 | get { return maxAgentGroups; } | ||
1113 | set { maxAgentGroups = value; } | ||
1114 | } | ||
1115 | |||
1105 | public string DestinationsURL | 1116 | public string DestinationsURL |
1106 | { | 1117 | { |
1107 | get; set; | 1118 | get; set; |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 96f2621..65030a4 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -80,6 +80,7 @@ namespace OpenSim.Services.LLLoginService | |||
80 | protected string m_SearchURL; | 80 | protected string m_SearchURL; |
81 | protected string m_Currency; | 81 | protected string m_Currency; |
82 | protected string m_ClassifiedFee; | 82 | protected string m_ClassifiedFee; |
83 | protected int m_MaxAgentGroups; | ||
83 | protected string m_DestinationGuide; | 84 | protected string m_DestinationGuide; |
84 | protected string m_AvatarPicker; | 85 | protected string m_AvatarPicker; |
85 | protected string m_AllowedClients; | 86 | protected string m_AllowedClients; |
@@ -127,6 +128,11 @@ namespace OpenSim.Services.LLLoginService | |||
127 | m_MessageUrl = m_LoginServerConfig.GetString("MessageUrl", string.Empty); | 128 | m_MessageUrl = m_LoginServerConfig.GetString("MessageUrl", string.Empty); |
128 | m_DSTZone = m_LoginServerConfig.GetString("DSTZone", "America/Los_Angeles;Pacific Standard Time"); | 129 | m_DSTZone = m_LoginServerConfig.GetString("DSTZone", "America/Los_Angeles;Pacific Standard Time"); |
129 | 130 | ||
131 | IConfig groupConfig = config.Configs["Groups"]; | ||
132 | if (groupConfig != null) | ||
133 | m_MaxAgentGroups = groupConfig.GetInt("MaxAgentGroups", 42); | ||
134 | |||
135 | |||
130 | // Clean up some of these vars | 136 | // Clean up some of these vars |
131 | if (m_MapTileURL != String.Empty) | 137 | if (m_MapTileURL != String.Empty) |
132 | { | 138 | { |
@@ -506,7 +512,7 @@ namespace OpenSim.Services.LLLoginService | |||
506 | account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, | 512 | account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, |
507 | where, startLocation, position, lookAt, gestures, processedMessage, home, clientIP, | 513 | where, startLocation, position, lookAt, gestures, processedMessage, home, clientIP, |
508 | m_MapTileURL, m_SearchURL, m_Currency, m_DSTZone, | 514 | m_MapTileURL, m_SearchURL, m_Currency, m_DSTZone, |
509 | m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee); | 515 | m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee, m_MaxAgentGroups); |
510 | 516 | ||
511 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); | 517 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); |
512 | 518 | ||