diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/IGridServices.cs | 3 | ||||
-rw-r--r-- | OpenSim/Framework/GridConfig.cs | 9 | ||||
-rw-r--r-- | OpenSim/Framework/IRegionCommsListener.cs | 1 | ||||
-rw-r--r-- | OpenSim/Framework/RegionCommsListener.cs | 5 |
4 files changed, 17 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs index 240d9c0..d51f234 100644 --- a/OpenSim/Framework/Communications/IGridServices.cs +++ b/OpenSim/Framework/Communications/IGridServices.cs | |||
@@ -25,7 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | using System.Collections; | |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | 30 | ||
31 | namespace OpenSim.Framework.Communications | 31 | namespace OpenSim.Framework.Communications |
@@ -37,6 +37,7 @@ namespace OpenSim.Framework.Communications | |||
37 | bool DeregisterRegion(RegionInfo regionInfo); | 37 | bool DeregisterRegion(RegionInfo regionInfo); |
38 | List<SimpleRegionInfo> RequestNeighbours(uint x, uint y); | 38 | List<SimpleRegionInfo> RequestNeighbours(uint x, uint y); |
39 | RegionInfo RequestNeighbourInfo(ulong regionHandle); | 39 | RegionInfo RequestNeighbourInfo(ulong regionHandle); |
40 | Dictionary<string, string> GetGridSettings(); | ||
40 | List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY); | 41 | List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY); |
41 | 42 | ||
42 | } | 43 | } |
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs index 021e6c5..799be46 100644 --- a/OpenSim/Framework/GridConfig.cs +++ b/OpenSim/Framework/GridConfig.cs | |||
@@ -44,9 +44,12 @@ namespace OpenSim.Framework | |||
44 | 44 | ||
45 | public string DatabaseProvider = ""; | 45 | public string DatabaseProvider = ""; |
46 | 46 | ||
47 | |||
47 | public static uint DefaultHttpPort = 8001; | 48 | public static uint DefaultHttpPort = 8001; |
48 | public uint HttpPort = DefaultHttpPort; | 49 | public uint HttpPort = DefaultHttpPort; |
49 | 50 | ||
51 | public string AllowForcefulBanlines = "TRUE"; | ||
52 | |||
50 | private ConfigurationMember configMember; | 53 | private ConfigurationMember configMember; |
51 | 54 | ||
52 | public GridConfig(string description, string filename) | 55 | public GridConfig(string description, string filename) |
@@ -89,6 +92,9 @@ namespace OpenSim.Framework | |||
89 | 92 | ||
90 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, | 93 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, |
91 | "Http Listener port", DefaultHttpPort.ToString(), false); | 94 | "Http Listener port", DefaultHttpPort.ToString(), false); |
95 | |||
96 | configMember.addConfigurationOption("allow_forceful_banlines", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | ||
97 | "Allow Forceful Banlines", "TRUE", true); | ||
92 | } | 98 | } |
93 | 99 | ||
94 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) | 100 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) |
@@ -128,6 +134,9 @@ namespace OpenSim.Framework | |||
128 | case "http_port": | 134 | case "http_port": |
129 | HttpPort = (uint) configuration_result; | 135 | HttpPort = (uint) configuration_result; |
130 | break; | 136 | break; |
137 | case "allow_forceful_banlines": | ||
138 | AllowForcefulBanlines = (string)configuration_result; | ||
139 | break; | ||
131 | } | 140 | } |
132 | 141 | ||
133 | return true; | 142 | return true; |
diff --git a/OpenSim/Framework/IRegionCommsListener.cs b/OpenSim/Framework/IRegionCommsListener.cs index 7aaeffe..363ab27 100644 --- a/OpenSim/Framework/IRegionCommsListener.cs +++ b/OpenSim/Framework/IRegionCommsListener.cs | |||
@@ -50,6 +50,7 @@ namespace OpenSim.Framework | |||
50 | 50 | ||
51 | public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData); | 51 | public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData); |
52 | 52 | ||
53 | |||
53 | 54 | ||
54 | 55 | ||
55 | public interface IRegionCommsListener | 56 | public interface IRegionCommsListener |
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs index e8752ac..a146778 100644 --- a/OpenSim/Framework/RegionCommsListener.cs +++ b/OpenSim/Framework/RegionCommsListener.cs | |||
@@ -44,6 +44,8 @@ namespace OpenSim.Framework | |||
44 | public event CloseAgentConnection OnCloseAgentConnection; | 44 | public event CloseAgentConnection OnCloseAgentConnection; |
45 | public event RegionUp OnRegionUp; | 45 | public event RegionUp OnRegionUp; |
46 | public event ChildAgentUpdate OnChildAgentUpdate; | 46 | public event ChildAgentUpdate OnChildAgentUpdate; |
47 | |||
48 | |||
47 | public string debugRegionName=""; | 49 | public string debugRegionName=""; |
48 | 50 | ||
49 | 51 | ||
@@ -62,6 +64,9 @@ namespace OpenSim.Framework | |||
62 | 64 | ||
63 | return false; | 65 | return false; |
64 | } | 66 | } |
67 | |||
68 | |||
69 | |||
65 | public virtual bool TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData) | 70 | public virtual bool TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData) |
66 | { | 71 | { |
67 | if (OnExpectUser != null) | 72 | if (OnExpectUser != null) |