diff options
Diffstat (limited to 'OpenSim/Client/Linden')
-rw-r--r-- | OpenSim/Client/Linden/LLStandaloneLoginService.cs | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginService.cs b/OpenSim/Client/Linden/LLStandaloneLoginService.cs index 2a13502..122110d 100644 --- a/OpenSim/Client/Linden/LLStandaloneLoginService.cs +++ b/OpenSim/Client/Linden/LLStandaloneLoginService.cs | |||
@@ -139,15 +139,8 @@ namespace OpenSim.Client.Linden | |||
139 | return m_regionsConnector.RequestNeighbourInfo(homeRegionId); | 139 | return m_regionsConnector.RequestNeighbourInfo(homeRegionId); |
140 | } | 140 | } |
141 | 141 | ||
142 | /// <summary> | 142 | protected override bool PrepareLoginToRegion( |
143 | /// Prepare a login to the given region. This involves both telling the region to expect a connection | 143 | RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint remoteClient) |
144 | /// and appropriately customising the response to the user. | ||
145 | /// </summary> | ||
146 | /// <param name="sim"></param> | ||
147 | /// <param name="user"></param> | ||
148 | /// <param name="response"></param> | ||
149 | /// <returns>true if the region was successfully contacted, false otherwise</returns> | ||
150 | protected override bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint remoteClient) | ||
151 | { | 144 | { |
152 | IPEndPoint endPoint = regionInfo.ExternalEndPoint; | 145 | IPEndPoint endPoint = regionInfo.ExternalEndPoint; |
153 | response.SimAddress = endPoint.Address.ToString(); | 146 | response.SimAddress = endPoint.Address.ToString(); |
@@ -204,7 +197,8 @@ namespace OpenSim.Client.Linden | |||
204 | agent.Appearance = m_userManager.GetUserAppearance(user.ID); | 197 | agent.Appearance = m_userManager.GetUserAppearance(user.ID); |
205 | if (agent.Appearance == null) | 198 | if (agent.Appearance == null) |
206 | { | 199 | { |
207 | m_log.WarnFormat("[INTER]: Appearance not found for {0} {1}. Creating default.", agent.firstname, agent.lastname); | 200 | m_log.WarnFormat( |
201 | "[INTER]: Appearance not found for {0} {1}. Creating default.", agent.firstname, agent.lastname); | ||
208 | agent.Appearance = new AvatarAppearance(agent.AgentID); | 202 | agent.Appearance = new AvatarAppearance(agent.AgentID); |
209 | } | 203 | } |
210 | 204 | ||
@@ -243,7 +237,8 @@ namespace OpenSim.Client.Linden | |||
243 | return; | 237 | return; |
244 | } | 238 | } |
245 | 239 | ||
246 | m_regionsConnector.LogOffUserFromGrid(SimInfo.RegionHandle, theUser.ID, theUser.CurrentAgent.SecureSessionID, "Logging you off"); | 240 | m_regionsConnector.LogOffUserFromGrid( |
241 | SimInfo.RegionHandle, theUser.ID, theUser.CurrentAgent.SecureSessionID, "Logging you off"); | ||
247 | } | 242 | } |
248 | } | 243 | } |
249 | } | 244 | } |