Some Rearranging of CommsManager.

2 files changed, 6 insertions, 4 deletions

diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.cs b/OpenSim/OpenSim.Region/Scenes/Scene.cs
index 2500ee6..c0eebd4 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Scene.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.Scenes
         public string m_datastore;

         protected AuthenticateSessionsBase authenticateHandler;

         protected RegionCommsHostBase regionCommsHost;

-        protected RegionServerCommsManager commsManager;

+        protected CommunicationsManager commsManager;

 

         public ParcelManager parcelManager;

         public EstateManager estateManager;

@@ -95,7 +95,7 @@ namespace OpenSim.Region.Scenes
         /// <param name="clientThreads">Dictionary to contain client threads</param>

         /// <param name="regionHandle">Region Handle for this region</param>

         /// <param name="regionName">Region Name for this region</param>

-        public Scene(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, RegionServerCommsManager commsMan)

+        public Scene(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan)

         {

             try

             {

@@ -416,7 +416,7 @@ namespace OpenSim.Region.Scenes
                     Console.WriteLine("creating new terrain");

                     this.Terrain.hills();

 

-                    this.localStorage.SaveMap(this.Terrain.getHeights1D());

+                   // this.localStorage.SaveMap(this.Terrain.getHeights1D());

                 }

                 else

                 {

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
index b126004..0ace92c 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
@@ -314,13 +314,15 @@ namespace OpenSim
 

         public void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, System.Net.IPAddress newRegionIP, ushort newRegionPort)

         {

+            LLVector3 look = new LLVector3(lookAt.X *10, lookAt.Y *10, lookAt.Z *10);

+            

             CrossedRegionPacket newSimPack = new CrossedRegionPacket();

             newSimPack.AgentData = new CrossedRegionPacket.AgentDataBlock();

             newSimPack.AgentData.AgentID = this.AgentID;

             newSimPack.AgentData.SessionID = this.SessionID;

             newSimPack.Info = new CrossedRegionPacket.InfoBlock();

             newSimPack.Info.Position = pos;

-            newSimPack.Info.LookAt = lookAt; // new LLVector3(0.0f, 0.0f, 0.0f);        // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!!

+            newSimPack.Info.LookAt = look; // new LLVector3(0.0f, 0.0f, 0.0f);  // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!!

             newSimPack.RegionData = new libsecondlife.Packets.CrossedRegionPacket.RegionDataBlock();

             newSimPack.RegionData.RegionHandle = newRegionHandle;

             byte[] byteIP = newRegionIP.GetAddressBytes();