aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
authorKitto Flora2010-11-11 04:51:05 +0000
committerKitto Flora2010-11-11 04:51:05 +0000
commitb2aeea66e36593ccab973240bab43724f577165b (patch)
tree4b7bed905081a7678411f251af260e14261cc545 /OpenSim/ApplicationPlugins
parentFix excessive forward motion and flailing while descending a slope, prevent a... (diff)
parentPrevent teleporting to a region when the egent is banned in all parcels (diff)
downloadopensim-SC_OLD-b2aeea66e36593ccab973240bab43724f577165b.zip
opensim-SC_OLD-b2aeea66e36593ccab973240bab43724f577165b.tar.gz
opensim-SC_OLD-b2aeea66e36593ccab973240bab43724f577165b.tar.bz2
opensim-SC_OLD-b2aeea66e36593ccab973240bab43724f577165b.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster 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>();