diff options
| author | Melanie | 2011-02-07 22:08:53 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-07 22:08:53 +0000 |
| commit | 3889e68c5441218a2ffeb2094b8251d31369837b (patch) | |
| tree | 69608c869c3823df4f417d9df34866f400045533 /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
| parent | Repair x-query-string (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-3889e68c5441218a2ffeb2094b8251d31369837b.zip opensim-SC-3889e68c5441218a2ffeb2094b8251d31369837b.tar.gz opensim-SC-3889e68c5441218a2ffeb2094b8251d31369837b.tar.bz2 opensim-SC-3889e68c5441218a2ffeb2094b8251d31369837b.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
OpenSim/Services/GridService/HypergridLinker.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 |
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 9e1d414..ca29a7c 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -1006,7 +1006,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 1006 | /// </summary> | 1006 | /// </summary> |
| 1007 | public void EnableChildAgent(ScenePresence sp, GridRegion region) | 1007 | public void EnableChildAgent(ScenePresence sp, GridRegion region) |
| 1008 | { | 1008 | { |
| 1009 | m_log.DebugFormat("[ENTITY TRANSFER]: Enabling child agent in new neighour {0}", region.RegionName); | 1009 | m_log.DebugFormat("[ENTITY TRANSFER]: Enabling child agent in new neighbour {0}", region.RegionName); |
| 1010 | 1010 | ||
| 1011 | AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode); | 1011 | AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode); |
| 1012 | AgentCircuitData agent = sp.ControllingClient.RequestClientInfo(); | 1012 | AgentCircuitData agent = sp.ControllingClient.RequestClientInfo(); |