diff options
author | Teravus Ovares | 2008-03-18 03:09:38 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-03-18 03:09:38 +0000 |
commit | 4e30f862af218de783552ffc2ca68ae8a11509c5 (patch) | |
tree | 7d8d07d08a16f6407646f6c66516e9df99b7ba84 /OpenSim/Grid/UserServer/UserLoginService.cs | |
parent | Last position will be stored in the DB on logout, and the avatar can continue... (diff) | |
download | opensim-SC_OLD-4e30f862af218de783552ffc2ca68ae8a11509c5.zip opensim-SC_OLD-4e30f862af218de783552ffc2ca68ae8a11509c5.tar.gz opensim-SC_OLD-4e30f862af218de783552ffc2ca68ae8a11509c5.tar.bz2 opensim-SC_OLD-4e30f862af218de783552ffc2ca68ae8a11509c5.tar.xz |
Building on Joha's update...
* Server now listens to the client's start location request for 'home' or 'last' and sends the user to the home location or the last location.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index e03ac3a..c8d0619 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
@@ -71,7 +71,7 @@ namespace OpenSim.Grid.UserServer | |||
71 | /// </summary> | 71 | /// </summary> |
72 | /// <param name="response">The existing response</param> | 72 | /// <param name="response">The existing response</param> |
73 | /// <param name="theUser">The user profile</param> | 73 | /// <param name="theUser">The user profile</param> |
74 | public override void CustomiseResponse(LoginResponse response, UserProfileData theUser) | 74 | public override void CustomiseResponse(LoginResponse response, UserProfileData theUser, string startLocationRequest) |
75 | { | 75 | { |
76 | bool tryDefault = false; | 76 | bool tryDefault = false; |
77 | //CFK: Since the try is always "tried", the "Home Location" message should always appear, so comment this one. | 77 | //CFK: Since the try is always "tried", the "Home Location" message should always appear, so comment this one. |
@@ -79,10 +79,30 @@ namespace OpenSim.Grid.UserServer | |||
79 | 79 | ||
80 | try | 80 | try |
81 | { | 81 | { |
82 | RegionProfileData SimInfo = | 82 | RegionProfileData SimInfo = null; |
83 | RegionProfileData.RequestSimProfileData( | 83 | if (startLocationRequest == "last") |
84 | theUser.currentAgent.currentHandle, m_config.GridServerURL, | 84 | { |
85 | m_config.GridSendKey, m_config.GridRecvKey); | 85 | SimInfo = |
86 | RegionProfileData.RequestSimProfileData( | ||
87 | theUser.currentAgent.currentHandle, m_config.GridServerURL, | ||
88 | m_config.GridSendKey, m_config.GridRecvKey); | ||
89 | } | ||
90 | else if (startLocationRequest == "home") | ||
91 | { | ||
92 | SimInfo = | ||
93 | RegionProfileData.RequestSimProfileData( | ||
94 | theUser.homeRegion, m_config.GridServerURL, | ||
95 | m_config.GridSendKey, m_config.GridRecvKey); | ||
96 | |||
97 | } | ||
98 | else | ||
99 | { | ||
100 | // TODO: Parse out startlocationrequest string in the format; 'uri:RegionName&X&Y&Z' | ||
101 | SimInfo = | ||
102 | RegionProfileData.RequestSimProfileData( | ||
103 | theUser.currentAgent.currentHandle, m_config.GridServerURL, | ||
104 | m_config.GridSendKey, m_config.GridRecvKey); | ||
105 | } | ||
86 | 106 | ||
87 | // Customise the response | 107 | // Customise the response |
88 | //CFK: This is redundant and the next message should always appear. | 108 | //CFK: This is redundant and the next message should always appear. |