diff options
author | Tom | 2011-09-04 07:06:36 -0700 |
---|---|---|
committer | Tom | 2011-09-04 07:06:36 -0700 |
commit | 66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch) | |
tree | 76cc708a821d35fac5cdbbce2de304b47064e732 /OpenSim/Services/LLLoginService | |
parent | Guard another nullref (diff) | |
parent | Fixed BulletSim config files for Linux *.so libraries. (diff) | |
download | opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2 opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz |
Resolve merge commits, stage 1
Diffstat (limited to 'OpenSim/Services/LLLoginService')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginResponse.cs | 19 | ||||
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 8 |
2 files changed, 23 insertions, 4 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 |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index e7dd15e..d8a2054 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -75,6 +75,7 @@ namespace OpenSim.Services.LLLoginService | |||
75 | protected bool m_AllowRemoteSetLoginLevel; | 75 | protected bool m_AllowRemoteSetLoginLevel; |
76 | protected string m_MapTileURL; | 76 | protected string m_MapTileURL; |
77 | protected string m_SearchURL; | 77 | protected string m_SearchURL; |
78 | protected string m_Currency; | ||
78 | 79 | ||
79 | protected string m_AllowedClients; | 80 | protected string m_AllowedClients; |
80 | protected string m_DeniedClients; | 81 | protected string m_DeniedClients; |
@@ -108,6 +109,7 @@ namespace OpenSim.Services.LLLoginService | |||
108 | m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); | 109 | m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); |
109 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); | 110 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); |
110 | m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); | 111 | m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); |
112 | m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); | ||
111 | 113 | ||
112 | m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty); | 114 | m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty); |
113 | m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty); | 115 | m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty); |
@@ -408,14 +410,14 @@ namespace OpenSim.Services.LLLoginService | |||
408 | if (m_FriendsService != null) | 410 | if (m_FriendsService != null) |
409 | { | 411 | { |
410 | friendsList = m_FriendsService.GetFriends(account.PrincipalID); | 412 | friendsList = m_FriendsService.GetFriends(account.PrincipalID); |
411 | m_log.DebugFormat("[LLOGIN SERVICE]: Retrieved {0} friends", friendsList.Length); | 413 | // m_log.DebugFormat("[LLOGIN SERVICE]: Retrieved {0} friends", friendsList.Length); |
412 | } | 414 | } |
413 | 415 | ||
414 | // | 416 | // |
415 | // Finally, fill out the response and return it | 417 | // Finally, fill out the response and return it |
416 | // | 418 | // |
417 | LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, | 419 | LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, |
418 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL); | 420 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL, m_Currency); |
419 | 421 | ||
420 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); | 422 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); |
421 | return response; | 423 | return response; |
@@ -792,7 +794,7 @@ namespace OpenSim.Services.LLLoginService | |||
792 | if (avatar != null) | 794 | if (avatar != null) |
793 | aCircuit.Appearance = new AvatarAppearance(avatar); | 795 | aCircuit.Appearance = new AvatarAppearance(avatar); |
794 | else | 796 | else |
795 | aCircuit.Appearance = new AvatarAppearance(account.PrincipalID); | 797 | aCircuit.Appearance = new AvatarAppearance(); |
796 | 798 | ||
797 | //aCircuit.BaseFolder = irrelevant | 799 | //aCircuit.BaseFolder = irrelevant |
798 | aCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath(); | 800 | aCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath(); |