diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
index f9cd90fc8c..131febd154 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
@@ -200,7 +200,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
#region IGridService
- public bool RegisterRegion(UUID scopeID, GridRegion regionInfo)
+ public string RegisterRegion(UUID scopeID, GridRegion regionInfo)
{
// Region doesn't exist here. Trying to link remote region
if (regionInfo.RegionID.Equals(UUID.Zero))
@@ -215,12 +215,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
// Try get the map image
m_HypergridServiceConnector.GetMapImage(regionInfo);
- return true;
+ return String.Empty;
}
else
{
m_log.Info("[HGrid]: No such region " + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "(" + regionInfo.InternalEndPoint.Port + ")");
- return false;
+ return "No such region";
}
// Note that these remote regions aren't registered in localBackend, so return null, no local listeners
}
@@ -469,7 +469,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
}
// Finally, link it
- if (!RegisterRegion(UUID.Zero, regInfo))
+ if (RegisterRegion(UUID.Zero, regInfo) != String.Empty)
{
m_log.Warn("[HGrid]: Unable to link region");
return false;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 1c72488bbc..144b5a4b46 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
#region IGridService
- public bool RegisterRegion(UUID scopeID, GridRegion regionInfo)
+ public string RegisterRegion(UUID scopeID, GridRegion regionInfo)
{
return m_GridService.RegisterRegion(scopeID, regionInfo);
}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
index 72c00fc02d..391e7c84f5 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
@@ -135,12 +135,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
#region IGridService
- public override bool RegisterRegion(UUID scopeID, GridRegion regionInfo)
+ public override string RegisterRegion(UUID scopeID, GridRegion regionInfo)
{
- if (m_LocalGridService.RegisterRegion(scopeID, regionInfo))
+ string msg = m_LocalGridService.RegisterRegion(scopeID, regionInfo);
+
+ if (msg == String.Empty)
return base.RegisterRegion(scopeID, regionInfo);
- return false;
+ return msg;
}
public override bool DeregisterRegion(UUID regionID)
diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs b/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
index 5cdf1911b2..d7fa316668 100644
--- a/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
@@ -32,13 +32,29 @@ namespace OpenSim.Region.Framework.Interfaces
{
public delegate void ScriptCommand(UUID script, string id, string module, string command, string k);
+ ///
+ /// Interface for communication between OpenSim modules and in-world scripts
+ ///
+ ///
+ /// See OpenSim.Region.ScriptEngine.Shared.Api.MOD_Api.modSendCommand() for information on receiving messages
+ /// from scripts in OpenSim modules.
public interface IScriptModuleComms
{
+ ///
+ /// Modules can subscribe to this event to receive command invocations from in-world scripts
+ ///
event ScriptCommand OnScriptCommand;
- void DispatchReply(UUID script, int code, string text, string k);
+ ///
+ /// Send a link_message event to an in-world script
+ ///
+ ///
+ ///
+ ///
+ ///
+ void DispatchReply(UUID scriptId, int code, string text, string key);
// For use ONLY by the script API
- void RaiseEvent(UUID script, string id, string module, string command, string k);
+ void RaiseEvent(UUID script, string id, string module, string command, string key);
}
}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 8ac4bc4b8c..db21bf9922 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1589,9 +1589,9 @@ namespace OpenSim.Region.Framework.Scenes
//m_sceneGridService.RegisterRegion(m_interregionCommsOut, RegionInfo);
GridRegion region = new GridRegion(RegionInfo);
- bool success = GridService.RegisterRegion(RegionInfo.ScopeID, region);
- if (!success)
- throw new Exception("Can't register with grid");
+ string error = GridService.RegisterRegion(RegionInfo.ScopeID, region);
+ if (error != String.Empty)
+ throw new Exception(error);
m_sceneGridService.SetScene(this);
m_sceneGridService.InformNeighborsThatRegionisUp(RequestModuleInterface(), RegionInfo);
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
index 3c5e8c9e65..b3fa07febd 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
@@ -220,8 +220,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
// Fail if fundamental information is still missing
- if (cs.Server == null || cs.IrcChannel == null || cs.BaseNickname == null || cs.User == null)
- throw new Exception(String.Format("[IRC-Channel-{0}] Invalid configuration for region {1}", cs.idn, rs.Region));
+ if (cs.Server == null)
+ throw new Exception(String.Format("[IRC-Channel-{0}] Invalid configuration for region {1}: server missing", cs.idn, rs.Region));
+ else if (cs.IrcChannel == null)
+ throw new Exception(String.Format("[IRC-Channel-{0}] Invalid configuration for region {1}: channel missing", cs.idn, rs.Region));
+ else if (cs.BaseNickname == null)
+ throw new Exception(String.Format("[IRC-Channel-{0}] Invalid configuration for region {1}: nick missing", cs.idn, rs.Region));
+ else if (cs.User == null)
+ throw new Exception(String.Format("[IRC-Channel-{0}] Invalid configuration for region {1}: user missing", cs.idn, rs.Region));
m_log.InfoFormat("[IRC-Channel-{0}] Configuration for Region {1} is valid", cs.idn, rs.Region);
m_log.InfoFormat("[IRC-Channel-{0}] Server = {1}", cs.idn, cs.Server);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 42c52dd75a..085d61faa0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7456,23 +7456,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Integer llGetNumberOfPrims()
{
m_host.AddScriptLPS(1);
- ScenePresence[] presences = World.GetScenePresences();
- if (presences.Length == 0)
- return 0;
-
int avatarCount = 0;
- for (int i = 0; i < presences.Length; i++)
+ World.ForEachScenePresence(delegate(ScenePresence presence)
{
- ScenePresence presence = presences[i];
-
- if (!presence.IsChildAgent && presence.ParentID != 0)
- {
- if (m_host.ParentGroup.HasChildPrim(presence.ParentID))
- {
+ if (!presence.IsChildAgent && presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID))
avatarCount++;
- }
- }
- }
+ });
return m_host.ParentGroup.PrimCount + avatarCount;
}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index a5be2512a1..1ddba1ed7f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1987,6 +1987,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return (int)pws;
}
+
public void osSetSpeed(string UUID, float SpeedModifier)
{
CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed");
@@ -1994,6 +1995,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
ScenePresence avatar = World.GetScenePresence(new UUID(UUID));
avatar.SpeedModifier = SpeedModifier;
}
+
public void osKickAvatar(string FirstName,string SurName,string alert)
{
CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar");
@@ -2014,6 +2016,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
}
}
+
public void osCauseDamage(string avatar, double damage)
{
CheckThreatLevel(ThreatLevel.High, "osCauseDamage");
@@ -2041,6 +2044,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
}
}
+
public void osCauseHealing(string avatar, double healing)
{
CheckThreatLevel(ThreatLevel.High, "osCauseHealing");
@@ -2065,4 +2069,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
}
}
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
index d99b791a1b..85a8738c4e 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -156,14 +156,14 @@ namespace OpenSim.Server.Handlers.Grid
m_log.DebugFormat("[GRID HANDLER]: exception unpacking region data: {0}", e);
}
- bool result = false;
+ string result = "Error communicating with grid service";
if (rinfo != null)
result = m_GridService.RegisterRegion(scopeID, rinfo);
- if (result)
+ if (result == String.Empty)
return SuccessResult();
else
- return FailureResult();
+ return FailureResult(result);
}
byte[] Deregister(Dictionary request)
@@ -431,6 +431,11 @@ namespace OpenSim.Server.Handlers.Grid
}
private byte[] FailureResult()
+ {
+ return FailureResult(String.Empty);
+ }
+
+ private byte[] FailureResult(string msg)
{
XmlDocument doc = new XmlDocument();
@@ -449,6 +454,11 @@ namespace OpenSim.Server.Handlers.Grid
rootElement.AppendChild(result);
+ XmlElement message = doc.CreateElement("", "Message", "");
+ message.AppendChild(doc.CreateTextNode(msg));
+
+ rootElement.AppendChild(message);
+
return DocToBytes(doc);
}
diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
index 99aa3fb15c..04c7c539ad 100644
--- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Services.Connectors
#region IGridService
- public virtual bool RegisterRegion(UUID scopeID, GridRegion regionInfo)
+ public virtual string RegisterRegion(UUID scopeID, GridRegion regionInfo)
{
Dictionary rinfo = regionInfo.ToKeyValuePairs();
Dictionary sendData = new Dictionary();
@@ -110,11 +110,23 @@ namespace OpenSim.Services.Connectors
Dictionary replyData = ServerUtils.ParseXmlResponse(reply);
if (replyData.ContainsKey("Result")&& (replyData["Result"].ToString().ToLower() == "success"))
- return true;
+ {
+ return String.Empty;
+ }
+ else if (replyData.ContainsKey("Result")&& (replyData["Result"].ToString().ToLower() == "failure"))
+ {
+ m_log.DebugFormat("[GRID CONNECTOR]: Registration failed: {0}", replyData["Message"].ToString());
+ return replyData["Message"].ToString();
+ }
else if (!replyData.ContainsKey("Result"))
+ {
m_log.DebugFormat("[GRID CONNECTOR]: reply data does not contain result field");
+ }
else
+ {
m_log.DebugFormat("[GRID CONNECTOR]: unexpected result {0}", replyData["Result"].ToString());
+ return "Unexpected result "+replyData["Result"].ToString();
+ }
}
else
@@ -125,7 +137,7 @@ namespace OpenSim.Services.Connectors
m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message);
}
- return false;
+ return "Error communicating with grid service";
}
public virtual bool DeregisterRegion(UUID regionID)
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 86815e53e5..7749c37384 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -46,15 +46,23 @@ namespace OpenSim.Services.GridService
LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType);
+ protected bool m_AllowDuplicateNames = false;
+
public GridService(IConfigSource config)
: base(config)
{
m_log.DebugFormat("[GRID SERVICE]: Starting...");
+
+ IConfig gridConfig = config.Configs["GridService"];
+ if (gridConfig != null)
+ {
+ m_AllowDuplicateNames = gridConfig.GetBoolean("AllowDuplicateNames", m_AllowDuplicateNames);
+ }
}
#region IGridService
- public bool RegisterRegion(UUID scopeID, GridRegion regionInfos)
+ public string RegisterRegion(UUID scopeID, GridRegion regionInfos)
{
// This needs better sanity testing. What if regionInfo is registering in
// overlapping coords?
@@ -63,7 +71,7 @@ namespace OpenSim.Services.GridService
{
m_log.WarnFormat("[GRID SERVICE]: Region {0} tried to register in coordinates {1}, {2} which are already in use in scope {3}.",
regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
- return false;
+ return "Region overlaps another region";
}
if ((region != null) && (region.RegionID == regionInfos.RegionID) &&
((region.posX != regionInfos.RegionLocX) || (region.posY != regionInfos.RegionLocY)))
@@ -82,6 +90,23 @@ namespace OpenSim.Services.GridService
}
}
+ if (!m_AllowDuplicateNames)
+ {
+ List dupe = m_Database.Get(regionInfos.RegionName, scopeID);
+ if (dupe != null && dupe.Count > 0)
+ {
+ foreach (RegionData d in dupe)
+ {
+ if (d.RegionID != regionInfos.RegionID)
+ {
+ m_log.WarnFormat("[GRID SERVICE]: Region {0} tried to register duplicate name with ID {1}.",
+ regionInfos.RegionName, regionInfos.RegionID);
+ return "Duplicate region name";
+ }
+ }
+ }
+ }
+
// Everything is ok, let's register
RegionData rdata = RegionInfo2RegionData(regionInfos);
rdata.ScopeID = scopeID;
@@ -97,7 +122,7 @@ namespace OpenSim.Services.GridService
m_log.DebugFormat("[GRID SERVICE]: Region {0} ({1}) registered successfully at {2}-{3}",
regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY);
- return true;
+ return String.Empty;
}
public bool DeregisterRegion(UUID regionID)
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index e69e4cd1dd..5135f6dad8 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Services.Interfaces
///
///
/// Thrown if region registration failed
- bool RegisterRegion(UUID scopeID, GridRegion regionInfos);
+ string RegisterRegion(UUID scopeID, GridRegion regionInfos);
///
/// Deregister a region with the grid service.
diff --git a/OpenSim/Tests/Clients/Grid/GridClient.cs b/OpenSim/Tests/Clients/Grid/GridClient.cs
index 972c0aa3bf..8e3337319b 100644
--- a/OpenSim/Tests/Clients/Grid/GridClient.cs
+++ b/OpenSim/Tests/Clients/Grid/GridClient.cs
@@ -63,27 +63,28 @@ namespace OpenSim.Tests.Clients.GridClient
GridRegion r3 = CreateRegion("Test Region 3", 1005, 1000);
Console.WriteLine("[GRID CLIENT]: *** Registering region 1");
- bool success = m_Connector.RegisterRegion(UUID.Zero, r1);
- if (success)
+ string msg = m_Connector.RegisterRegion(UUID.Zero, r1);
+ if (msg == String.Empty)
Console.WriteLine("[GRID CLIENT]: Successfully registered region 1");
else
Console.WriteLine("[GRID CLIENT]: region 1 failed to register");
Console.WriteLine("[GRID CLIENT]: *** Registering region 2");
- success = m_Connector.RegisterRegion(UUID.Zero, r2);
- if (success)
+ msg = m_Connector.RegisterRegion(UUID.Zero, r2);
+ if (msg == String.Empty)
Console.WriteLine("[GRID CLIENT]: Successfully registered region 2");
else
Console.WriteLine("[GRID CLIENT]: region 2 failed to register");
Console.WriteLine("[GRID CLIENT]: *** Registering region 3");
- success = m_Connector.RegisterRegion(UUID.Zero, r3);
- if (success)
+ msg = m_Connector.RegisterRegion(UUID.Zero, r3);
+ if (msg == String.Empty)
Console.WriteLine("[GRID CLIENT]: Successfully registered region 3");
else
Console.WriteLine("[GRID CLIENT]: region 3 failed to register");
+ bool success;
Console.WriteLine("[GRID CLIENT]: *** Deregistering region 3");
success = m_Connector.DeregisterRegion(r3.RegionID);
if (success)
@@ -91,8 +92,8 @@ namespace OpenSim.Tests.Clients.GridClient
else
Console.WriteLine("[GRID CLIENT]: region 3 failed to deregister");
Console.WriteLine("[GRID CLIENT]: *** Registering region 3 again");
- success = m_Connector.RegisterRegion(UUID.Zero, r3);
- if (success)
+ msg = m_Connector.RegisterRegion(UUID.Zero, r3);
+ if (msg == String.Empty)
Console.WriteLine("[GRID CLIENT]: Successfully registered region 3");
else
Console.WriteLine("[GRID CLIENT]: region 3 failed to register");
diff --git a/addon-modules/README b/addon-modules/README
index 19f268fa52..b5bf2e007e 100644
--- a/addon-modules/README
+++ b/addon-modules/README
@@ -3,3 +3,7 @@ In this directory you can place addon modules for OpenSim
Each module should be in it's own tree and the root of the tree
should contain a file named "prebuild.xml", which will be included in the
main prebuild file.
+
+The prebuild.xml should only contain and associated child tags.
+The , , and tags should not be
+included since the add-on modules prebuild.xml will be inserted directly into the main prebuild.xml
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index 12af0cd2c4..d4e05af5d0 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -80,3 +80,4 @@ LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=grid;"
Realm = "regions"
+; AllowDuplicateNames = "True"
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index fa2a4a1ebd..7ee3e51b57 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -485,6 +485,8 @@
; OfflineMessageURL = http://yourserver/Offline.php
; MuteListModule = MuteListModule
; MuteListURL = http://yourserver/Mute.php
+
+ ; Control whether group messages are forwarded to offline users. Default is true.
; ForwardOfflineGroupMessages = true
@@ -996,6 +998,11 @@
; Compile debug info (line numbers) into the script assemblies
CompileWithDebugInformation = true
+ ; Allow the user of mod* functions. This allows a script to pass messages
+ ; to a region module via the modSendCommand() function
+ ; Default is false
+ AllowMODFunctions = false
+
; Allow the use of os* functions (some are dangerous)
AllowOSFunctions = false