diff options
| author | Melanie | 2011-12-08 05:47:45 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-08 05:47:45 +0000 |
| commit | 8d7c353500c97c0a88b84a7b7d52b17828219fdd (patch) | |
| tree | 9887fb6742f7d6132ac3d3105387e669dd6cffbb | |
| parent | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge (diff) | |
| parent | Remove a left over log output (diff) | |
| download | opensim-SC_OLD-8d7c353500c97c0a88b84a7b7d52b17828219fdd.zip opensim-SC_OLD-8d7c353500c97c0a88b84a7b7d52b17828219fdd.tar.gz opensim-SC_OLD-8d7c353500c97c0a88b84a7b7d52b17828219fdd.tar.bz2 opensim-SC_OLD-8d7c353500c97c0a88b84a7b7d52b17828219fdd.tar.xz | |
Merge branch 'master' into bigmerge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 9298726..0939620 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -214,7 +214,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 214 | { | 214 | { |
| 215 | Hashtable requestData = (Hashtable) request.Params[0]; | 215 | Hashtable requestData = (Hashtable) request.Params[0]; |
| 216 | 216 | ||
| 217 | m_log.Info("[RADMIN]: Request to restart Region."); | ||
| 218 | CheckStringParameters(requestData, responseData, new string[] {"password"}); | 217 | CheckStringParameters(requestData, responseData, new string[] {"password"}); |
| 219 | 218 | ||
| 220 | FailIfRemoteAdminNotAllowed((string)requestData["password"], responseData, remoteClient.Address.ToString()); | 219 | FailIfRemoteAdminNotAllowed((string)requestData["password"], responseData, remoteClient.Address.ToString()); |