aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs14
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
4 files changed, 16 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs
index 6c89ac8..9172536 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
66 return; 66 return;
67 67
68 m_log.DebugFormat("[REGION CACHE]: (on region {0}) Region {1} is up @ {2}-{3}", 68 m_log.DebugFormat("[REGION CACHE]: (on region {0}) Region {1} is up @ {2}-{3}",
69 m_scene.RegionInfo.RegionName, otherRegion.RegionName, otherRegion.RegionLocX, otherRegion.RegionLocY); 69 m_scene.RegionInfo.RegionName, otherRegion.RegionName, otherRegion.RegionLocX / Constants.RegionSize, otherRegion.RegionLocY / Constants.RegionSize);
70 70
71 m_neighbours[otherRegion.RegionHandle] = otherRegion; 71 m_neighbours[otherRegion.RegionHandle] = otherRegion;
72 } 72 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
index dfba0d6..33cc838 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
@@ -36,6 +36,7 @@ using OpenSim.Framework;
36using OpenSim.Services.Connectors; 36using OpenSim.Services.Connectors;
37using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Server.Base;
39using OpenSim.Services.Interfaces; 40using OpenSim.Services.Interfaces;
40using GridRegion = OpenSim.Services.Interfaces.GridRegion; 41using GridRegion = OpenSim.Services.Interfaces.GridRegion;
41 42
@@ -97,9 +98,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
97 return; 98 return;
98 } 99 }
99 100
101 string networkConnector = gridConfig.GetString("NetworkConnector", string.Empty);
102 if (networkConnector == string.Empty)
103 {
104 m_log.Error("[REMOTE GRID CONNECTOR]: Please specify a network connector under [GridService]");
105 return;
106 }
107
108 Object[] args = new Object[] { source };
109 m_RemoteGridService = ServerUtils.LoadPlugin<IGridService>(networkConnector, args);
110
100 m_LocalGridService = new LocalGridServicesConnector(source); 111 m_LocalGridService = new LocalGridServicesConnector(source);
101 m_RemoteGridService = new GridServicesConnector(source); 112 }
102 }
103 113
104 public void PostInitialise() 114 public void PostInitialise()
105 { 115 {
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index e3ba190..f9d28b9 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -148,7 +148,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
148 148
149 string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString(); 149 string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString();
150 regionimage = regionimage.Replace("-", ""); 150 regionimage = regionimage.Replace("-", "");
151 m_log.Info("[WORLD MAP]: JPEG Map location: " + m_scene.RegionInfo.ServerURI + "/index.php?method=" + regionimage); 151 m_log.Info("[WORLD MAP]: JPEG Map location: " + m_scene.RegionInfo.ServerURI + "index.php?method=" + regionimage);
152 152
153 MainServer.Instance.AddHTTPHandler(regionimage, OnHTTPGetMapImage); 153 MainServer.Instance.AddHTTPHandler(regionimage, OnHTTPGetMapImage);
154 MainServer.Instance.AddLLSDHandler( 154 MainServer.Instance.AddLLSDHandler(
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a90caa9..066e504 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -836,8 +836,8 @@ namespace OpenSim.Region.Framework.Scenes
836 { 836 {
837 uint xcell = (uint)((int)otherRegion.RegionLocX / (int)Constants.RegionSize); 837 uint xcell = (uint)((int)otherRegion.RegionLocX / (int)Constants.RegionSize);
838 uint ycell = (uint)((int)otherRegion.RegionLocY / (int)Constants.RegionSize); 838 uint ycell = (uint)((int)otherRegion.RegionLocY / (int)Constants.RegionSize);
839 m_log.InfoFormat("[SCENE]: (on region {0}): Region {1} up in coords {2}-{3}", 839 //m_log.InfoFormat("[SCENE]: (on region {0}): Region {1} up in coords {2}-{3}",
840 RegionInfo.RegionName, otherRegion.RegionName, xcell, ycell); 840 // RegionInfo.RegionName, otherRegion.RegionName, xcell, ycell);
841 841
842 if (RegionInfo.RegionHandle != otherRegion.RegionHandle) 842 if (RegionInfo.RegionHandle != otherRegion.RegionHandle)
843 { 843 {