aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs11
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs10
-rw-r--r--OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs2
-rw-r--r--bin/OpenSim.ini.example3
4 files changed, 21 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
index d84f4ea..f15f8f6 100644
--- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
@@ -87,7 +87,10 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
87 87
88 foreach (IMonitor monitor in m_monitors) 88 foreach (IMonitor monitor in m_monitors)
89 { 89 {
90 if (monitor.ToString() == monID) 90 string elemName = monitor.ToString();
91 if (elemName.StartsWith(monitor.GetType().Namespace))
92 elemName = elemName.Substring(monitor.GetType().Namespace.Length + 1);
93 if (elemName == monID || monitor.ToString() == monID)
91 { 94 {
92 Hashtable ereply3 = new Hashtable(); 95 Hashtable ereply3 = new Hashtable();
93 96
@@ -112,7 +115,11 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
112 string xml = "<data>"; 115 string xml = "<data>";
113 foreach (IMonitor monitor in m_monitors) 116 foreach (IMonitor monitor in m_monitors)
114 { 117 {
115 xml += "<" + monitor.ToString() + ">" + monitor.GetValue() + "</" + monitor.ToString() + ">"; 118 string elemName = monitor.ToString();
119 if (elemName.StartsWith(monitor.GetType().Namespace))
120 elemName = elemName.Substring(monitor.GetType().Namespace.Length + 1);
121
122 xml += "<" + elemName + ">" + monitor.GetValue() + "</" + elemName + ">";
116 } 123 }
117 xml += "</data>"; 124 xml += "</data>";
118 125
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 6a0e8d1..28669b9 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.World.Land
81 private int m_lastLandLocalID = LandChannel.START_LAND_LOCAL_ID - 1; 81 private int m_lastLandLocalID = LandChannel.START_LAND_LOCAL_ID - 1;
82 82
83 private bool m_allowedForcefulBans = true; 83 private bool m_allowedForcefulBans = true;
84 private string DefaultGodParcelGroup; 84 private UUID DefaultGodParcelGroup;
85 private string DefaultGodParcelName; 85 private string DefaultGodParcelName;
86 86
87 // caches ExtendedLandData 87 // caches ExtendedLandData
@@ -96,6 +96,12 @@ namespace OpenSim.Region.CoreModules.World.Land
96 96
97 public void Initialise(IConfigSource source) 97 public void Initialise(IConfigSource source)
98 { 98 {
99 IConfig cnf = source.Configs["LandManagement"];
100 if (cnf == null)
101 {
102 DefaultGodParcelGroup = new UUID(cnf.GetString("DefaultAdministratorGroupUUID", UUID.Zero.ToString()));
103 DefaultGodParcelName = cnf.GetString("DefaultAdministratorParcelName", "Default Parcel");
104 }
99 } 105 }
100 106
101 public void AddRegion(Scene scene) 107 public void AddRegion(Scene scene)
@@ -1566,7 +1572,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1566 land = landObject; 1572 land = landObject;
1567 } 1573 }
1568 } 1574 }
1569 land.DeedToGroup(new UUID(DefaultGodParcelGroup)); 1575 land.DeedToGroup(DefaultGodParcelGroup);
1570 land.LandData.Name = DefaultGodParcelName; 1576 land.LandData.Name = DefaultGodParcelName;
1571 land.SendLandUpdateToAvatarsOverMe(); 1577 land.SendLandUpdateToAvatarsOverMe();
1572 } 1578 }
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
index 3f33da6..f33bb90 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Server.Handlers.Asset
63 63
64 if (p.Length > 0) 64 if (p.Length > 0)
65 { 65 {
66 result = m_AssetService.Delete(p[0]); 66 // result = m_AssetService.Delete(p[0]);
67 } 67 }
68 68
69 XmlSerializer xs = new XmlSerializer(typeof(bool)); 69 XmlSerializer xs = new XmlSerializer(typeof(bool));
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index c96e938..23004a4 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1351,6 +1351,9 @@
1351; For example- http://127.0.0.1:9000/SStats/ 1351; For example- http://127.0.0.1:9000/SStats/
1352; enabled=false 1352; enabled=false
1353 1353
1354[LandManagement]
1355; DefaultAdministratorGroupUUID = "";
1356; DefaultAdministratorParcelName = "";
1354 1357
1355;; 1358;;
1356;; These are defaults that are overwritten below in [Architecture]. 1359;; These are defaults that are overwritten below in [Architecture].