aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs5
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs70
3 files changed, 42 insertions, 37 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 8ec2f20..e20c24f 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -235,7 +235,10 @@ namespace OpenSim.Region.ClientStack.Linden
235 235
236 if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) 236 if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint))
237 { 237 {
238 m_log.DebugFormat("[CAPS]: Unauthorized CAPS client"); 238 m_log.DebugFormat(
239 "[CAPS]: Unauthorized CAPS client {0} from {1}",
240 m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint);
241
239 return string.Empty; 242 return string.Empty;
240 } 243 }
241 244
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index fb6b11e..d05f72f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1350,7 +1350,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1350 } 1350 }
1351 else 1351 else
1352 { 1352 {
1353 m_log.DebugFormat("[LLUDPSERVER]: Dropping incoming {0} packet for dead client {1}", packet.Type, udpClient.AgentID); 1353 m_log.DebugFormat(
1354 "[LLUDPSERVER]: Dropped incoming {0} for dead client {1} in {2}",
1355 packet.Type, udpClient.AgentID, m_scene.RegionInfo.RegionName);
1354 } 1356 }
1355 } 1357 }
1356 1358
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.