ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Added a configuration parameter on the Grid Server to disallow forceful banlists.

Browse Source 
* Added a way for Grid based configuration parameters to (generally used in overriding functionality) to get to the regions on Registration.
This commit is contained in:
Teravus Ovares
2007-12-20 06:31:03 +00:00
parent be2ad79e52
commit 8aae909412
9 changed files with 99 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/Communications/IGridServices.cs
View File

@@ -25,7 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
using System.Collections;
using System.Collections.Generic;
namespace OpenSim.Framework.Communications
@@ -37,6 +37,7 @@ namespace OpenSim.Framework.Communications
bool DeregisterRegion(RegionInfo regionInfo);
List<SimpleRegionInfo> RequestNeighbours(uint x, uint y);
RegionInfo RequestNeighbourInfo(ulong regionHandle);
Dictionary<string, string> GetGridSettings();
List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY);
}

9
OpenSim/Framework/GridConfig.cs
View File

@@ -44,9 +44,12 @@ namespace OpenSim.Framework
public string DatabaseProvider = "";
public static uint DefaultHttpPort = 8001;
public uint HttpPort = DefaultHttpPort;
public string AllowForcefulBanlines = "TRUE";
private ConfigurationMember configMember;
public GridConfig(string description, string filename)
@@ -89,6 +92,9 @@ namespace OpenSim.Framework
configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Http Listener port", DefaultHttpPort.ToString(), false);
configMember.addConfigurationOption("allow_forceful_banlines", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"Allow Forceful Banlines", "TRUE", true);
}
public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -128,6 +134,9 @@ namespace OpenSim.Framework
case "http_port":
HttpPort = (uint) configuration_result;
break;
case "allow_forceful_banlines":
AllowForcefulBanlines = (string)configuration_result;
break;
}
return true;

1
OpenSim/Framework/IRegionCommsListener.cs
View File

@@ -50,6 +50,7 @@ namespace OpenSim.Framework
public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData);
public interface IRegionCommsListener

5
OpenSim/Framework/RegionCommsListener.cs
View File

@@ -44,6 +44,8 @@ namespace OpenSim.Framework
public event CloseAgentConnection OnCloseAgentConnection;
public event RegionUp OnRegionUp;
public event ChildAgentUpdate OnChildAgentUpdate;
public string debugRegionName="";
@@ -62,6 +64,9 @@ namespace OpenSim.Framework
return false;
}
public virtual bool TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData)
{
if (OnExpectUser != null)