diff options
| author | Melanie | 2012-02-04 11:48:20 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-04 11:48:20 +0000 |
| commit | ce5e900721cb0447f76bcb198faf5f7c31eeaf6e (patch) | |
| tree | c906a2b8858f9c590e39e2a26f47017fd7b6b9c6 /OpenSim/ApplicationPlugins | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add default value to TelehubObject (diff) | |
| download | opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.zip opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.gz opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.bz2 opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
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 914e4d6..49a8e64 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -1510,9 +1510,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 1510 | // options["version"] = (string)requestData["version"]; | 1510 | // options["version"] = (string)requestData["version"]; |
| 1511 | //} | 1511 | //} |
| 1512 | 1512 | ||
| 1513 | if (requestData.Contains("profile")) | 1513 | if (requestData.Contains("home")) |
| 1514 | { | 1514 | { |
| 1515 | options["profile"] = (string)requestData["profile"]; | 1515 | options["home"] = (string)requestData["home"]; |
| 1516 | } | 1516 | } |
| 1517 | 1517 | ||
| 1518 | if ((string)requestData["noassets"] == "true") | 1518 | if ((string)requestData["noassets"] == "true") |