aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
diff options
context:
space:
mode:
authorMelanie2011-02-05 04:25:14 +0000
committerMelanie2011-02-05 04:25:14 +0000
commitf78831ec9841eccea9ecb4077193e2ae7c3985c3 (patch)
treeb6118825d9dd4ebfc1f1f1f966009ac30b293af5 /OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
parentFix a typo in the QUERYACCESS method name (diff)
parentAdded an additional debug message, and removed a bunch of files that weren't ... (diff)
downloadopensim-SC_OLD-f78831ec9841eccea9ecb4077193e2ae7c3985c3.zip
opensim-SC_OLD-f78831ec9841eccea9ecb4077193e2ae7c3985c3.tar.gz
opensim-SC_OLD-f78831ec9841eccea9ecb4077193e2ae7c3985c3.tar.bz2
opensim-SC_OLD-f78831ec9841eccea9ecb4077193e2ae7c3985c3.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 54b95f7..80a8041 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -983,7 +983,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
983 /// </summary> 983 /// </summary>
984 public void EnableChildAgent(ScenePresence sp, GridRegion region) 984 public void EnableChildAgent(ScenePresence sp, GridRegion region)
985 { 985 {
986 m_log.DebugFormat("[ENTITY TRANSFER]: Enabling child agent in new neighour {0}", region.RegionName); 986 m_log.DebugFormat("[ENTITY TRANSFER]: Enabling child agent in new neighbour {0}", region.RegionName);
987 987
988 AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode); 988 AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
989 AgentCircuitData agent = sp.ControllingClient.RequestClientInfo(); 989 AgentCircuitData agent = sp.ControllingClient.RequestClientInfo();