diff options
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
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 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 |