diff options
| author | Diva Canto | 2012-09-30 06:52:19 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-09-30 06:52:19 -0700 |
| commit | 14a4b146bf7f3552defcbe1e99fdbc64cb8fbf9c (patch) | |
| tree | 3c76fe34e863fa990c6da0f72d8350c7476cf1e4 /OpenSim/ApplicationPlugins | |
| parent | Made a method of GridUserService virtual so it can be overridden. (diff) | |
| parent | Get rid of some unnecessary casts in RemoteAdminPlugin. (diff) | |
| download | opensim-SC_OLD-14a4b146bf7f3552defcbe1e99fdbc64cb8fbf9c.zip opensim-SC_OLD-14a4b146bf7f3552defcbe1e99fdbc64cb8fbf9c.tar.gz opensim-SC_OLD-14a4b146bf7f3552defcbe1e99fdbc64cb8fbf9c.tar.bz2 opensim-SC_OLD-14a4b146bf7f3552defcbe1e99fdbc64cb8fbf9c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/ApplicationPlugins')
| -rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 5d80ba9..15fbddd 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -572,7 +572,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 572 | 572 | ||
| 573 | region.ExternalHostName = (string) requestData["external_address"]; | 573 | region.ExternalHostName = (string) requestData["external_address"]; |
| 574 | 574 | ||
| 575 | bool persist = Convert.ToBoolean((string) requestData["persist"]); | 575 | bool persist = Convert.ToBoolean(requestData["persist"]); |
| 576 | if (persist) | 576 | if (persist) |
| 577 | { | 577 | { |
| 578 | // default place for region configuration files is in the | 578 | // default place for region configuration files is in the |
| @@ -981,8 +981,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 981 | string lastName = (string) requestData["user_lastname"]; | 981 | string lastName = (string) requestData["user_lastname"]; |
| 982 | string password = (string) requestData["user_password"]; | 982 | string password = (string) requestData["user_password"]; |
| 983 | 983 | ||
| 984 | uint regionXLocation = Convert.ToUInt32((Int32) requestData["start_region_x"]); | 984 | uint regionXLocation = Convert.ToUInt32(requestData["start_region_x"]); |
| 985 | uint regionYLocation = Convert.ToUInt32((Int32) requestData["start_region_y"]); | 985 | uint regionYLocation = Convert.ToUInt32(requestData["start_region_y"]); |
| 986 | 986 | ||
| 987 | string email = ""; // empty string for email | 987 | string email = ""; // empty string for email |
| 988 | if (requestData.Contains("user_email")) | 988 | if (requestData.Contains("user_email")) |
| @@ -1179,9 +1179,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 1179 | 1179 | ||
| 1180 | if (requestData.ContainsKey("user_password")) password = (string) requestData["user_password"]; | 1180 | if (requestData.ContainsKey("user_password")) password = (string) requestData["user_password"]; |
| 1181 | if (requestData.ContainsKey("start_region_x")) | 1181 | if (requestData.ContainsKey("start_region_x")) |
| 1182 | regionXLocation = Convert.ToUInt32((Int32) requestData["start_region_x"]); | 1182 | regionXLocation = Convert.ToUInt32(requestData["start_region_x"]); |
| 1183 | if (requestData.ContainsKey("start_region_y")) | 1183 | if (requestData.ContainsKey("start_region_y")) |
| 1184 | regionYLocation = Convert.ToUInt32((Int32) requestData["start_region_y"]); | 1184 | regionYLocation = Convert.ToUInt32(requestData["start_region_y"]); |
| 1185 | 1185 | ||
| 1186 | // if (requestData.ContainsKey("start_lookat_x")) | 1186 | // if (requestData.ContainsKey("start_lookat_x")) |
| 1187 | // ulaX = Convert.ToUInt32((Int32) requestData["start_lookat_x"]); | 1187 | // ulaX = Convert.ToUInt32((Int32) requestData["start_lookat_x"]); |