aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
authorMelanie2010-11-09 22:16:48 +0000
committerMelanie2010-11-09 22:16:48 +0000
commitee85a530f6401a7be15778f15f0e2319c714c3d4 (patch)
treece3d924fe0d4c8679731c78ea8090c6ca022bdcb /OpenSim/ApplicationPlugins
parentFix parcel bans to work only on the avatars they're supposed to work on inste... (diff)
parentFix parcel bans to work only on the avatars they're supposed to work on inste... (diff)
downloadopensim-SC-ee85a530f6401a7be15778f15f0e2319c714c3d4.zip
opensim-SC-ee85a530f6401a7be15778f15f0e2319c714c3d4.tar.gz
opensim-SC-ee85a530f6401a7be15778f15f0e2319c714c3d4.tar.bz2
opensim-SC-ee85a530f6401a7be15778f15f0e2319c714c3d4.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index ba95426..3a4f729 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>();