aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService/LLLoginService.cs
diff options
context:
space:
mode:
authorBlueWall2012-02-21 14:21:03 -0500
committerBlueWall2012-02-21 14:21:03 -0500
commit7cf970fb27297d9550d4bdb1d520e9c6ff0a381d (patch)
treeb89bb60e9e90518b63f58b0067d68a9d07e41fa1 /OpenSim/Services/LLLoginService/LLLoginService.cs
parentBoth 32-bit and 64-bit BulletSim.dll must have the same name. Rename the 64 ... (diff)
downloadopensim-SC_OLD-7cf970fb27297d9550d4bdb1d520e9c6ff0a381d.zip
opensim-SC_OLD-7cf970fb27297d9550d4bdb1d520e9c6ff0a381d.tar.gz
opensim-SC_OLD-7cf970fb27297d9550d4bdb1d520e9c6ff0a381d.tar.bz2
opensim-SC_OLD-7cf970fb27297d9550d4bdb1d520e9c6ff0a381d.tar.xz
V3 Support:
This starts V3 support by adding a profile server url to the login response. This requires viewer support - which is also being worked on.
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginService.cs')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 5dff512..02e62c8 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -74,6 +74,7 @@ namespace OpenSim.Services.LLLoginService
74 protected string m_GatekeeperURL; 74 protected string m_GatekeeperURL;
75 protected bool m_AllowRemoteSetLoginLevel; 75 protected bool m_AllowRemoteSetLoginLevel;
76 protected string m_MapTileURL; 76 protected string m_MapTileURL;
77 protected string m_ProfileURL;
77 protected string m_SearchURL; 78 protected string m_SearchURL;
78 protected string m_Currency; 79 protected string m_Currency;
79 80
@@ -108,6 +109,7 @@ namespace OpenSim.Services.LLLoginService
108 m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); 109 m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0);
109 m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); 110 m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty);
110 m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); 111 m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
112 m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty);
111 m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); 113 m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
112 m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); 114 m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty);
113 115
@@ -413,7 +415,7 @@ namespace OpenSim.Services.LLLoginService
413 // Finally, fill out the response and return it 415 // Finally, fill out the response and return it
414 // 416 //
415 LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, 417 LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
416 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL, m_Currency); 418 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_ProfileURL, m_SearchURL, m_Currency);
417 419
418 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); 420 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
419 return response; 421 return response;