diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index e5a6d49413..43dea0bd3b 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -93,6 +93,7 @@ what it is today.
* Garmin Kawaguichi
* Gryc Ueusp
* Hiro Lecker
+* Iain Oliver
* Imaze Rhiano
* Intimidated
* Jeremy Bongio (IBM)
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 3198891a30..77fce9e6e4 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -720,8 +720,11 @@ namespace OpenSim.Framework.Servers.HttpServer
if (DebugLevel == 5)
{
const int sampleLength = 80;
- char[] sampleChars = new char[sampleLength];
+ char[] sampleChars = new char[sampleLength + 3];
reader.Read(sampleChars, 0, sampleLength);
+ sampleChars[80] = '.';
+ sampleChars[81] = '.';
+ sampleChars[82] = '.';
output = new string(sampleChars);
}
else
@@ -729,7 +732,7 @@ namespace OpenSim.Framework.Servers.HttpServer
output = reader.ReadToEnd();
}
- m_log.DebugFormat("[BASE HTTP SERVER]: {0}...", output.Replace("\n", @"\n"));
+ m_log.DebugFormat("[BASE HTTP SERVER]: {0}", output.Replace("\n", @"\n"));
}
}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/BasePresenceServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/BasePresenceServiceConnector.cs
new file mode 100644
index 0000000000..fdbe10a86e
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/BasePresenceServiceConnector.cs
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
+
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
+{
+ public class BasePresenceServiceConnector : IPresenceService
+ {
+ private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+ protected bool m_Enabled;
+
+ protected PresenceDetector m_PresenceDetector;
+
+ ///
+ /// Underlying presence service. Do not use directly.
+ ///
+ public IPresenceService m_PresenceService;
+
+ public Type ReplaceableInterface
+ {
+ get { return null; }
+ }
+
+ public void AddRegion(Scene scene)
+ {
+ if (!m_Enabled)
+ return;
+
+ // m_log.DebugFormat(
+ // "[LOCAL PRESENCE CONNECTOR]: Registering IPresenceService to scene {0}", scene.RegionInfo.RegionName);
+
+ scene.RegisterModuleInterface(this);
+ m_PresenceDetector.AddRegion(scene);
+
+ m_log.InfoFormat("[BASE PRESENCE SERVICE CONNECTOR]: Enabled for region {0}", scene.Name);
+ }
+
+ public void RemoveRegion(Scene scene)
+ {
+ if (!m_Enabled)
+ return;
+
+ m_PresenceDetector.RemoveRegion(scene);
+ }
+
+ public void RegionLoaded(Scene scene)
+ {
+ if (!m_Enabled)
+ return;
+
+ }
+
+ public void PostInitialise()
+ {
+ }
+
+ public void Close()
+ {
+ }
+
+ #region IPresenceService
+
+ public bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID)
+ {
+ m_log.Warn("[BASE PRESENCE SERVICE CONNECTOR]: LoginAgent connector not implemented at the simulators");
+ return false;
+ }
+
+ public bool LogoutAgent(UUID sessionID)
+ {
+ return m_PresenceService.LogoutAgent(sessionID);
+ }
+
+ public bool LogoutRegionAgents(UUID regionID)
+ {
+ return m_PresenceService.LogoutRegionAgents(regionID);
+ }
+
+ public bool ReportAgent(UUID sessionID, UUID regionID)
+ {
+ return m_PresenceService.ReportAgent(sessionID, regionID);
+ }
+
+ public PresenceInfo GetAgent(UUID sessionID)
+ {
+ return m_PresenceService.GetAgent(sessionID);
+ }
+
+ public PresenceInfo[] GetAgents(string[] userIDs)
+ {
+ // Don't bother potentially making a useless network call if we not going to ask for any users anyway.
+ if (userIDs.Length == 0)
+ return new PresenceInfo[0];
+
+ return m_PresenceService.GetAgents(userIDs);
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs
index d8bed1b79d..db5c520be3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs
@@ -24,53 +24,29 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
using System;
using System.Collections.Generic;
using System.Reflection;
-
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Server.Base;
using OpenSim.Services.Interfaces;
using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
-using OpenMetaverse;
-using log4net;
-using Mono.Addins;
-using Nini.Config;
-
namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LocalPresenceServicesConnector")]
- public class LocalPresenceServicesConnector : ISharedRegionModule, IPresenceService
+ public class LocalPresenceServicesConnector : BasePresenceServiceConnector, ISharedRegionModule, IPresenceService
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- private bool m_Enabled = false;
-
- private PresenceDetector m_PresenceDetector;
-
- ///
- /// Underlying presence service. Do not use directly.
- ///
- public IPresenceService m_PresenceService;
-
- public LocalPresenceServicesConnector()
- {
- }
-
- public LocalPresenceServicesConnector(IConfigSource source)
- {
- Initialise(source);
- }
-
#region ISharedRegionModule
- public Type ReplaceableInterface
- {
- get { return null; }
- }
-
public string Name
{
get { return "LocalPresenceServicesConnector"; }
@@ -121,81 +97,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
}
}
- public void PostInitialise()
- {
- }
-
- public void Close()
- {
- }
-
- public void AddRegion(Scene scene)
- {
- if (!m_Enabled)
- return;
-
- // m_log.DebugFormat(
- // "[LOCAL PRESENCE CONNECTOR]: Registering IPresenceService to scene {0}", scene.RegionInfo.RegionName);
-
- scene.RegisterModuleInterface(this);
- m_PresenceDetector.AddRegion(scene);
-
- m_log.InfoFormat("[LOCAL PRESENCE CONNECTOR]: Enabled local presence for region {0}", scene.RegionInfo.RegionName);
-
- }
-
- public void RemoveRegion(Scene scene)
- {
- if (!m_Enabled)
- return;
-
- m_PresenceDetector.RemoveRegion(scene);
- }
-
- public void RegionLoaded(Scene scene)
- {
- if (!m_Enabled)
- return;
-
- }
-
#endregion
-
- #region IPresenceService
-
- public bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID)
- {
- m_log.Warn("[LOCAL PRESENCE CONNECTOR]: LoginAgent connector not implemented at the simulators");
- return false;
- }
-
- public bool LogoutAgent(UUID sessionID)
- {
- return m_PresenceService.LogoutAgent(sessionID);
- }
-
-
- public bool LogoutRegionAgents(UUID regionID)
- {
- return m_PresenceService.LogoutRegionAgents(regionID);
- }
-
- public bool ReportAgent(UUID sessionID, UUID regionID)
- {
- return m_PresenceService.ReportAgent(sessionID, regionID);
- }
-
- public PresenceInfo GetAgent(UUID sessionID)
- {
- return m_PresenceService.GetAgent(sessionID);
- }
-
- public PresenceInfo[] GetAgents(string[] userIDs)
- {
- return m_PresenceService.GetAgents(userIDs);
- }
-
- #endregion
-
}
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs
index be73932ce4..6ca5c28993 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs
@@ -43,22 +43,12 @@ using Nini.Config;
namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemotePresenceServicesConnector")]
- public class RemotePresenceServicesConnector : ISharedRegionModule, IPresenceService
+ public class RemotePresenceServicesConnector : BasePresenceServiceConnector, ISharedRegionModule
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
#region ISharedRegionModule
- private bool m_Enabled = false;
-
- private PresenceDetector m_PresenceDetector;
- private IPresenceService m_RemoteConnector;
-
- public Type ReplaceableInterface
- {
- get { return null; }
- }
-
public string Name
{
get { return "RemotePresenceServicesConnector"; }
@@ -72,7 +62,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
string name = moduleConfig.GetString("PresenceServices", "");
if (name == Name)
{
- m_RemoteConnector = new PresenceServicesConnector(source);
+ m_PresenceService = new PresenceServicesConnector(source);
m_Enabled = true;
@@ -81,81 +71,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
m_log.Info("[REMOTE PRESENCE CONNECTOR]: Remote presence enabled");
}
}
-
- }
-
- public void PostInitialise()
- {
- }
-
- public void Close()
- {
- }
-
- public void AddRegion(Scene scene)
- {
- if (!m_Enabled)
- return;
-
- scene.RegisterModuleInterface(this);
- m_PresenceDetector.AddRegion(scene);
-
- m_log.InfoFormat("[REMOTE PRESENCE CONNECTOR]: Enabled remote presence for region {0}", scene.RegionInfo.RegionName);
-
- }
-
- public void RemoveRegion(Scene scene)
- {
- if (!m_Enabled)
- return;
-
- m_PresenceDetector.RemoveRegion(scene);
- }
-
- public void RegionLoaded(Scene scene)
- {
- if (!m_Enabled)
- return;
-
}
#endregion
-
- #region IPresenceService
-
- public bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID)
- {
- m_log.Warn("[REMOTE PRESENCE CONNECTOR]: LoginAgent connector not implemented at the simulators");
- return false;
- }
-
- public bool LogoutAgent(UUID sessionID)
- {
- return m_RemoteConnector.LogoutAgent(sessionID);
- }
-
-
- public bool LogoutRegionAgents(UUID regionID)
- {
- return m_RemoteConnector.LogoutRegionAgents(regionID);
- }
-
- public bool ReportAgent(UUID sessionID, UUID regionID)
- {
- return m_RemoteConnector.ReportAgent(sessionID, regionID);
- }
-
- public PresenceInfo GetAgent(UUID sessionID)
- {
- return m_RemoteConnector.GetAgent(sessionID);
- }
-
- public PresenceInfo[] GetAgents(string[] userIDs)
- {
- return m_RemoteConnector.GetAgents(userIDs);
- }
-
- #endregion
-
}
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
index 4556df3535..32e47f9dda 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
@@ -56,7 +56,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests
config.Configs["PresenceService"].Set("LocalServiceModule", "OpenSim.Services.PresenceService.dll:PresenceService");
config.Configs["PresenceService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
- m_LocalConnector = new LocalPresenceServicesConnector(config);
+ m_LocalConnector = new LocalPresenceServicesConnector();
+ m_LocalConnector.Initialise(config);
// Let's stick in a test presence
m_LocalConnector.m_PresenceService.LoginAgent(UUID.Zero.ToString(), UUID.Zero, UUID.Zero);
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 25a53b4142..7f07d73e86 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1844,8 +1844,16 @@ namespace OpenSim.Region.Framework.Scenes
// "[SCENE PRESENCE]: Avatar {0} received request to move to position {1} in {2}",
// Name, pos, m_scene.RegionInfo.RegionName);
- if (pos.X < 0 || pos.X >= Constants.RegionSize
- || pos.Y < 0 || pos.Y >= Constants.RegionSize
+ // Allow move to another sub-region within a megaregion
+ Vector2 regionSize;
+ IRegionCombinerModule regionCombinerModule = m_scene.RequestModuleInterface();
+ if (regionCombinerModule != null)
+ regionSize = regionCombinerModule.GetSizeOfMegaregion(m_scene.RegionInfo.RegionID);
+ else
+ regionSize = new Vector2(Constants.RegionSize);
+
+ if (pos.X < 0 || pos.X >= regionSize.X
+ || pos.Y < 0 || pos.Y >= regionSize.Y
|| pos.Z < 0)
return;
@@ -1859,7 +1867,16 @@ namespace OpenSim.Region.Framework.Scenes
// pos.Z = AbsolutePosition.Z;
// }
- float terrainHeight = (float)m_scene.Heightmap[(int)pos.X, (int)pos.Y];
+ // Get terrain height for sub-region in a megaregion if necessary
+ int X = (int)((m_scene.RegionInfo.RegionLocX * Constants.RegionSize) + pos.X);
+ int Y = (int)((m_scene.RegionInfo.RegionLocY * Constants.RegionSize) + pos.Y);
+ UUID target_regionID = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, X, Y).RegionID;
+ Scene targetScene = m_scene;
+
+ if (!SceneManager.Instance.TryGetScene(target_regionID, out targetScene))
+ targetScene = m_scene;
+
+ float terrainHeight = (float)targetScene.Heightmap[(int)(pos.X % Constants.RegionSize), (int)(pos.Y % Constants.RegionSize)];
pos.Z = Math.Max(terrainHeight, pos.Z);
// Fudge factor. It appears that if one clicks "go here" on a piece of ground, the go here request is
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index b21a214339..6757081b1c 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -439,9 +439,30 @@
;; What is reported as the "User-Agent" when using llHTTPRequest
;; Defaults to not sent if not set here. See the notes section in the wiki
;; at http://wiki.secondlife.com/wiki/LlHTTPRequest for comments on adding
- ;; " (Mozilla Compatible)" to the text where there are problems with a web server
+ ;; " (Mozilla Compatible)" to the text where there are problems with a
+ ;; web server
; user_agent = "OpenSim LSL (Mozilla Compatible)"
+[XMLRPC]
+ ;# {XmlRpcRouterModule} {} {Module used to route incoming llRemoteData calls} {XmlRpcRouterModule XmlRpcGridRouterModule} XmlRpcRouterModule
+ ;; If enabled and set to XmlRpcRouterModule, this will post an event,
+ ;; "xmlrpc_uri(string)" to the script concurrently with the first
+ ;; remote_data event. This will contain the fully qualified URI an
+ ;; external site needs to use to send XMLRPC requests to that script
+ ;;
+ ;; If enabled and set to XmlRpcGridRouterModule, newly created channels
+ ;; will be registered with an external service via a configured uri
+ ;XmlRpcRouterModule = "XmlRpcRouterModule"
+
+ ;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800
+ ;XmlRpcPort = 20800
+
+ ;# {XmlRpcHubURI} {XmlRpcRouterModule} {URI for external service used to register xmlrpc channels created in the simulator. This depends on XmlRpcRouterModule being set to XmlRpcGridRouterModule} http://example.com
+ ;; If XmlRpcRouterModule is set to XmlRpcGridRouterModule, the simulator
+ ;; will use this address to register xmlrpc channels on the external
+ ;; service
+ ; XmlRpcHubURI = http://example.com
+
[ClientStack.LindenUDP]
;; See OpensSimDefaults.ini for the throttle options. You can copy the
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 16cde7e736..01ba5b9119 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -425,20 +425,6 @@
; many simultaneous requests, default is 30 and is currently applied only to assets
;MaxRequestConcurrency = 30
-[XMLRPC]
- ; ##
- ; ## Scripting XMLRPC mapper
- ; ##
-
- ; If enabled, this will post an event, "xmlrpc_uri(string)" to the
- ; script concurrently with the first remote_data event.
- ; This will contain the fully qualified URI an external site needs
- ; to use to send XMLRPC requests to that script
-
- ;XmlRpcRouterModule = "XmlRpcRouterModule"
- ;XmlRpcPort = 20800
-
-
[ClientStack.LindenUDP]
; Set this to true to process incoming packets asynchronously. Networking is
; already separated from packet handling with a queue, so this will only