diff options
Diffstat (limited to 'OpenSim/OpenSim.Region/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/OpenSim.Region/Scenes/Scene.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.cs b/OpenSim/OpenSim.Region/Scenes/Scene.cs index 07f1d70..07b1ee4 100644 --- a/OpenSim/OpenSim.Region/Scenes/Scene.cs +++ b/OpenSim/OpenSim.Region/Scenes/Scene.cs | |||
@@ -730,7 +730,7 @@ namespace OpenSim.Region.Scenes | |||
730 | if (agent.CapsPath != "") | 730 | if (agent.CapsPath != "") |
731 | { | 731 | { |
732 | //Console.WriteLine("new user, so creating caps handler for it"); | 732 | //Console.WriteLine("new user, so creating caps handler for it"); |
733 | Caps cap = new Caps(httpListener, this.m_regInfo.IPListenAddr, 9000, agent.CapsPath, agent.AgentID); | 733 | Caps cap = new Caps(this.assetCache, httpListener, this.m_regInfo.IPListenAddr, 9000, agent.CapsPath, agent.AgentID); |
734 | cap.RegisterHandlers(); | 734 | cap.RegisterHandlers(); |
735 | this.capsHandlers.Add(cap); | 735 | this.capsHandlers.Add(cap); |
736 | } | 736 | } |
@@ -795,7 +795,7 @@ namespace OpenSim.Region.Scenes | |||
795 | { | 795 | { |
796 | List<MapBlockData> mapBlocks; | 796 | List<MapBlockData> mapBlocks; |
797 | mapBlocks = this.commsManager.GridServer.RequestNeighbourMapBlocks(minX, minY, maxX, maxY); | 797 | mapBlocks = this.commsManager.GridServer.RequestNeighbourMapBlocks(minX, minY, maxX, maxY); |
798 | 798 | Console.WriteLine("number of mapblocks " + mapBlocks.Count +" in "+ minX +" , " + minY + " , "+ maxX + " , "+ maxY); | |
799 | remoteClient.SendMapBlock(mapBlocks); | 799 | remoteClient.SendMapBlock(mapBlocks); |
800 | } | 800 | } |
801 | 801 | ||
@@ -843,9 +843,9 @@ namespace OpenSim.Region.Scenes | |||
843 | /// <param name="regionhandle"></param> | 843 | /// <param name="regionhandle"></param> |
844 | /// <param name="agentID"></param> | 844 | /// <param name="agentID"></param> |
845 | /// <param name="position"></param> | 845 | /// <param name="position"></param> |
846 | public void InformNeighbourOfCrossing(ulong regionhandle, LLUUID agentID, LLVector3 position) | 846 | public bool InformNeighbourOfCrossing(ulong regionhandle, LLUUID agentID, LLVector3 position) |
847 | { | 847 | { |
848 | this.commsManager.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position); | 848 | return this.commsManager.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position); |
849 | } | 849 | } |
850 | 850 | ||
851 | #endregion | 851 | #endregion |