diff options
| author | Jonathan Freedman | 2010-11-21 19:51:23 -0800 |
|---|---|---|
| committer | Jonathan Freedman | 2010-11-21 19:51:23 -0800 |
| commit | 562147475cc24a18da2b812a69ce2330c7633cf6 (patch) | |
| tree | 1168b5591f615442f8a09fd9776209d0923c2b3d /OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |
| parent | Merge git://github.com/opensim/opensim into mantis5110 (diff) | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| download | opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.zip opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.tar.gz opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.tar.bz2 opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.tar.xz | |
Merge https://github.com/opensim/opensim into mantis5110
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs')
| -rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 854307c..15adb99 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -117,7 +117,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 117 | 117 | ||
| 118 | m_application = openSim; | 118 | m_application = openSim; |
| 119 | string bind_ip_address = m_config.GetString("bind_ip_address", "0.0.0.0"); | 119 | string bind_ip_address = m_config.GetString("bind_ip_address", "0.0.0.0"); |
| 120 | IPAddress ipaddr = IPAddress.Parse( bind_ip_address ); | 120 | IPAddress ipaddr = IPAddress.Parse(bind_ip_address); |
| 121 | m_httpServer = MainServer.GetHttpServer((uint)port,ipaddr); | 121 | m_httpServer = MainServer.GetHttpServer((uint)port,ipaddr); |
| 122 | 122 | ||
| 123 | Dictionary<string, XmlRpcMethod> availableMethods = new Dictionary<string, XmlRpcMethod>(); | 123 | Dictionary<string, XmlRpcMethod> availableMethods = new Dictionary<string, XmlRpcMethod>(); |