diff options
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginResponse.cs')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginResponse.cs | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index 82acfbc..de05f28 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -188,6 +188,8 @@ namespace OpenSim.Services.LLLoginService | |||
188 | 188 | ||
189 | private BuddyList m_buddyList = null; | 189 | private BuddyList m_buddyList = null; |
190 | 190 | ||
191 | private string currency; | ||
192 | |||
191 | static LLLoginResponse() | 193 | static LLLoginResponse() |
192 | { | 194 | { |
193 | // This is being set, but it's not used | 195 | // This is being set, but it's not used |
@@ -223,7 +225,7 @@ namespace OpenSim.Services.LLLoginService | |||
223 | public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, | 225 | public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, |
224 | GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, | 226 | GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, |
225 | string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, | 227 | string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, |
226 | GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL) | 228 | GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency) |
227 | : this() | 229 | : this() |
228 | { | 230 | { |
229 | FillOutInventoryData(invSkel, libService); | 231 | FillOutInventoryData(invSkel, libService); |
@@ -241,6 +243,7 @@ namespace OpenSim.Services.LLLoginService | |||
241 | StartLocation = where; | 243 | StartLocation = where; |
242 | MapTileURL = mapTileURL; | 244 | MapTileURL = mapTileURL; |
243 | SearchURL = searchURL; | 245 | SearchURL = searchURL; |
246 | Currency = currency; | ||
244 | 247 | ||
245 | FillOutHomeData(pinfo, home); | 248 | FillOutHomeData(pinfo, home); |
246 | LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z); | 249 | LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z); |
@@ -388,6 +391,8 @@ namespace OpenSim.Services.LLLoginService | |||
388 | initialOutfit.Add(InitialOutfitHash); | 391 | initialOutfit.Add(InitialOutfitHash); |
389 | mapTileURL = String.Empty; | 392 | mapTileURL = String.Empty; |
390 | searchURL = String.Empty; | 393 | searchURL = String.Empty; |
394 | |||
395 | currency = String.Empty; | ||
391 | } | 396 | } |
392 | 397 | ||
393 | 398 | ||
@@ -462,6 +467,12 @@ namespace OpenSim.Services.LLLoginService | |||
462 | responseData["buddy-list"] = m_buddyList.ToArray(); | 467 | responseData["buddy-list"] = m_buddyList.ToArray(); |
463 | } | 468 | } |
464 | 469 | ||
470 | if (currency != String.Empty) | ||
471 | { | ||
472 | // responseData["real_currency"] = currency; | ||
473 | responseData["currency"] = currency; | ||
474 | } | ||
475 | |||
465 | responseData["login"] = "true"; | 476 | responseData["login"] = "true"; |
466 | 477 | ||
467 | return responseData; | 478 | return responseData; |
@@ -946,6 +957,12 @@ namespace OpenSim.Services.LLLoginService | |||
946 | set { m_buddyList = value; } | 957 | set { m_buddyList = value; } |
947 | } | 958 | } |
948 | 959 | ||
960 | public string Currency | ||
961 | { | ||
962 | get { return currency; } | ||
963 | set { currency = value; } | ||
964 | } | ||
965 | |||
949 | #endregion | 966 | #endregion |
950 | 967 | ||
951 | public class UserInfo | 968 | public class UserInfo |