OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into casper

avinationmerge
CasperW 2010-01-20 22:19:14 +01:00
parent 496a8a4f7c 24056dc98b
commit a964431c21
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
View File

@ -87,7 +87,10 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
foreach (IMonitor monitor in m_monitors)
{
if (monitor.ToString() == monID)
string elemName = monitor.ToString();
if (elemName.StartsWith(monitor.GetType().Namespace))
elemName = elemName.Substring(monitor.GetType().Namespace.Length + 1);
if (elemName == monID || monitor.ToString() == monID)
{
Hashtable ereply3 = new Hashtable();
@ -112,7 +115,11 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
string xml = "<data>";
foreach (IMonitor monitor in m_monitors)
{
xml += "<" + monitor.ToString() + ">" + monitor.GetValue() + "</" + monitor.ToString() + ">";
string elemName = monitor.ToString();
if (elemName.StartsWith(monitor.GetType().Namespace))
elemName = elemName.Substring(monitor.GetType().Namespace.Length + 1);
xml += "<" + elemName + ">" + monitor.GetValue() + "</" + elemName + ">";
}
xml += "</data>";

10
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.World.Land
private int m_lastLandLocalID = LandChannel.START_LAND_LOCAL_ID - 1;
private bool m_allowedForcefulBans = true;
private string DefaultGodParcelGroup;
private UUID DefaultGodParcelGroup;
private string DefaultGodParcelName;
// caches ExtendedLandData
@ -96,6 +96,12 @@ namespace OpenSim.Region.CoreModules.World.Land
public void Initialise(IConfigSource source)
{
IConfig cnf = source.Configs["LandManagement"];
if (cnf == null)
{
DefaultGodParcelGroup = new UUID(cnf.GetString("DefaultAdministratorGroupUUID", UUID.Zero.ToString()));
DefaultGodParcelName = cnf.GetString("DefaultAdministratorParcelName", "Default Parcel");
}
}
public void AddRegion(Scene scene)
@ -1566,7 +1572,7 @@ namespace OpenSim.Region.CoreModules.World.Land
land = landObject;
}
}
land.DeedToGroup(new UUID(DefaultGodParcelGroup));
land.DeedToGroup(DefaultGodParcelGroup);
land.LandData.Name = DefaultGodParcelName;
land.SendLandUpdateToAvatarsOverMe();
}

2
OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
View File

@ -63,7 +63,7 @@ namespace OpenSim.Server.Handlers.Asset
if (p.Length > 0)
{
result = m_AssetService.Delete(p[0]);
// result = m_AssetService.Delete(p[0]);
}
XmlSerializer xs = new XmlSerializer(typeof(bool));

3
bin/OpenSim.ini.example
View File

@ -1351,6 +1351,9 @@
; For example- http://127.0.0.1:9000/SStats/
; enabled=false
[LandManagement]
; DefaultAdministratorGroupUUID = "";
; DefaultAdministratorParcelName = "";
;;
;; These are defaults that are overwritten below in [Architecture].