aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-04-26 16:20:53 +0100
committerJustin Clark-Casey (justincc)2012-04-26 16:20:53 +0100
commitca228c4770660096bde98fb603e7e295808a2133 (patch)
tree792b60bc4bcc7a0a0faf9abbb3f633188d75d94b
parentminor: Add more detail to unauthorized caps client message (diff)
downloadopensim-SC_OLD-ca228c4770660096bde98fb603e7e295808a2133.zip
opensim-SC_OLD-ca228c4770660096bde98fb603e7e295808a2133.tar.gz
opensim-SC_OLD-ca228c4770660096bde98fb603e7e295808a2133.tar.bz2
opensim-SC_OLD-ca228c4770660096bde98fb603e7e295808a2133.tar.xz
Comment out old Scene.HandleLogOffUserFromGrid() to reduce client closing analysis complexity
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs70
1 files changed, 35 insertions, 35 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a46c827..dacd9b6 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3796,41 +3796,41 @@ namespace OpenSim.Region.Framework.Scenes
3796 return m_authenticateHandler.TryChangeCiruitCode(oldcc, newcc); 3796 return m_authenticateHandler.TryChangeCiruitCode(oldcc, newcc);
3797 } 3797 }
3798 3798
3799 /// <summary> 3799// /// <summary>
3800 /// The Grid has requested that we log-off a user. Log them off. 3800// /// The Grid has requested that we log-off a user. Log them off.
3801 /// </summary> 3801// /// </summary>
3802 /// <param name="AvatarID">Unique ID of the avatar to log-off</param> 3802// /// <param name="AvatarID">Unique ID of the avatar to log-off</param>
3803 /// <param name="RegionSecret">SecureSessionID of the user, or the RegionSecret text when logging on to the grid</param> 3803// /// <param name="RegionSecret">SecureSessionID of the user, or the RegionSecret text when logging on to the grid</param>
3804 /// <param name="message">message to display to the user. Reason for being logged off</param> 3804// /// <param name="message">message to display to the user. Reason for being logged off</param>
3805 public void HandleLogOffUserFromGrid(UUID AvatarID, UUID RegionSecret, string message) 3805// public void HandleLogOffUserFromGrid(UUID AvatarID, UUID RegionSecret, string message)
3806 { 3806// {
3807 ScenePresence loggingOffUser = GetScenePresence(AvatarID); 3807// ScenePresence loggingOffUser = GetScenePresence(AvatarID);
3808 if (loggingOffUser != null) 3808// if (loggingOffUser != null)
3809 { 3809// {
3810 UUID localRegionSecret = UUID.Zero; 3810// UUID localRegionSecret = UUID.Zero;
3811 bool parsedsecret = UUID.TryParse(m_regInfo.regionSecret, out localRegionSecret); 3811// bool parsedsecret = UUID.TryParse(m_regInfo.regionSecret, out localRegionSecret);
3812 3812//
3813 // Region Secret is used here in case a new sessionid overwrites an old one on the user server. 3813// // Region Secret is used here in case a new sessionid overwrites an old one on the user server.
3814 // Will update the user server in a few revisions to use it. 3814// // Will update the user server in a few revisions to use it.
3815 3815//
3816 if (RegionSecret == loggingOffUser.ControllingClient.SecureSessionId || (parsedsecret && RegionSecret == localRegionSecret)) 3816// if (RegionSecret == loggingOffUser.ControllingClient.SecureSessionId || (parsedsecret && RegionSecret == localRegionSecret))
3817 { 3817// {
3818 m_sceneGridService.SendCloseChildAgentConnections(loggingOffUser.UUID, loggingOffUser.KnownRegionHandles); 3818// m_sceneGridService.SendCloseChildAgentConnections(loggingOffUser.UUID, loggingOffUser.KnownRegionHandles);
3819 loggingOffUser.ControllingClient.Kick(message); 3819// loggingOffUser.ControllingClient.Kick(message);
3820 // Give them a second to receive the message! 3820// // Give them a second to receive the message!
3821 Thread.Sleep(1000); 3821// Thread.Sleep(1000);
3822 loggingOffUser.ControllingClient.Close(); 3822// loggingOffUser.ControllingClient.Close();
3823 } 3823// }
3824 else 3824// else
3825 { 3825// {
3826 m_log.Info("[USERLOGOFF]: System sending the LogOff user message failed to sucessfully authenticate"); 3826// m_log.Info("[USERLOGOFF]: System sending the LogOff user message failed to sucessfully authenticate");
3827 } 3827// }
3828 } 3828// }
3829 else 3829// else
3830 { 3830// {
3831 m_log.InfoFormat("[USERLOGOFF]: Got a logoff request for {0} but the user isn't here. The user might already have been logged out", AvatarID.ToString()); 3831// m_log.InfoFormat("[USERLOGOFF]: Got a logoff request for {0} but the user isn't here. The user might already have been logged out", AvatarID.ToString());
3832 } 3832// }
3833 } 3833// }
3834 3834
3835 /// <summary> 3835 /// <summary>
3836 /// Triggered when an agent crosses into this sim. Also happens on initial login. 3836 /// Triggered when an agent crosses into this sim. Also happens on initial login.