diff options
| author | Justin Clark-Casey (justincc) | 2009-11-03 19:11:09 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-11-03 19:11:09 +0000 |
| commit | af0e5d097480de264e7501e7d5d35328be5640bb (patch) | |
| tree | 4ca5cd796ed9618dc9134a6e5eee1f7e7912bee4 /OpenSim/ApplicationPlugins/RemoteController | |
| parent | minor: remove some mono compiler warnings (diff) | |
| parent | Fixed a couple of NREs in corner cases. (diff) | |
| download | opensim-SC-af0e5d097480de264e7501e7d5d35328be5640bb.zip opensim-SC-af0e5d097480de264e7501e7d5d35328be5640bb.tar.gz opensim-SC-af0e5d097480de264e7501e7d5d35328be5640bb.tar.bz2 opensim-SC-af0e5d097480de264e7501e7d5d35328be5640bb.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
| -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 f4e1db4..3c7727f 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -360,7 +360,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 360 | && ((string) requestData["shutdown"] == "delayed") | 360 | && ((string) requestData["shutdown"] == "delayed") |
| 361 | && requestData.ContainsKey("milliseconds")) | 361 | && requestData.ContainsKey("milliseconds")) |
| 362 | { | 362 | { |
| 363 | timeout = (Int32) requestData["milliseconds"]; | 363 | timeout = Int32.Parse(requestData["milliseconds"].ToString()); |
| 364 | 364 | ||
| 365 | message | 365 | message |
| 366 | = "Region is going down in " + ((int) (timeout/1000)).ToString() | 366 | = "Region is going down in " + ((int) (timeout/1000)).ToString() |