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

Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmerge 

Conflicts:
	OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
avinationmerge
Melanie 2011-10-12 07:09:41 +01:00
parent 1c67c13d77 71d29decc8
commit 3a290e581a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@ -41,7 +41,6 @@ using OpenMetaverse;
using OpenSim;
using OpenSim.Framework;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer;
@ -67,7 +66,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
private IConfig m_config;
private IConfigSource m_configSource;
private string m_requiredPassword = String.Empty;
private List<string> m_accessIP;
private HashSet<string> m_accessIP;
private string m_name = "RemoteAdminPlugin";
private string m_version = "0.0";
@ -106,7 +105,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
int port = m_config.GetInt("port", 0);
string accessIP = m_config.GetString("access_ip_addresses", String.Empty);
m_accessIP = new List<string>();
m_accessIP = new HashSet<string>();
if (accessIP != String.Empty)
{
string[] ips = accessIP.Split(new char[] { ',' });
@ -288,6 +287,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
restartModule.ScheduleRestart(UUID.Zero, message, times.ToArray(), notice);
responseData["success"] = true;
}
response.Value = responseData;
}
catch (Exception e)

1
prebuild.xml
View File

@ -1907,6 +1907,7 @@
<ReferencePath>../../../bin/</ReferencePath>
<Reference name="Mono.Addins" path="../../../bin/"/>
<Reference name="System"/>
<Reference name="System.Core"/>
<Reference name="System.Xml"/>
<Reference name="OpenMetaverse" path="../../../bin/"/>
<Reference name="OpenMetaverseTypes" path="../../../bin/"/>