diff options
| author | Justin Clark-Casey (justincc) | 2012-02-03 23:48:12 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-03 23:48:12 +0000 |
| commit | 2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598 (patch) | |
| tree | 95acd2d2fc13dd77637549d8ce1f0ba78d4eb10d /OpenSim/ApplicationPlugins | |
| parent | Change SceneObjectSerializer to use common ExternalRepresentationUtils.Execut... (diff) | |
| parent | Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.zip opensim-SC-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.tar.gz opensim-SC-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.tar.bz2 opensim-SC-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 7f1a0ed..24570d6 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -1410,9 +1410,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 1410 | // options["version"] = (string)requestData["version"]; | 1410 | // options["version"] = (string)requestData["version"]; |
| 1411 | //} | 1411 | //} |
| 1412 | 1412 | ||
| 1413 | if (requestData.Contains("profile")) | 1413 | if (requestData.Contains("home")) |
| 1414 | { | 1414 | { |
| 1415 | options["profile"] = (string)requestData["profile"]; | 1415 | options["home"] = (string)requestData["home"]; |
| 1416 | } | 1416 | } |
| 1417 | 1417 | ||
| 1418 | if ((string)requestData["noassets"] == "true") | 1418 | if ((string)requestData["noassets"] == "true") |