diff options
| author | Melanie | 2011-12-19 21:30:57 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-19 21:30:57 +0000 |
| commit | efa4284391d6098172c6b57fe8fa5e1d881a31ab (patch) | |
| tree | ad5ecc940b428f93e977f096218c85f1d1e146bc /OpenSim/ApplicationPlugins/RemoteController | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Stop sending the viewer its own AvatarAppearance packet. (diff) | |
| download | opensim-SC_OLD-efa4284391d6098172c6b57fe8fa5e1d881a31ab.zip opensim-SC_OLD-efa4284391d6098172c6b57fe8fa5e1d881a31ab.tar.gz opensim-SC_OLD-efa4284391d6098172c6b57fe8fa5e1d881a31ab.tar.bz2 opensim-SC_OLD-efa4284391d6098172c6b57fe8fa5e1d881a31ab.tar.xz | |
Merge branch 'master' into careminster
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 2930753..d26a1bd 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -1545,7 +1545,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 1545 | options["profile"] = (string)requestData["profile"]; | 1545 | options["profile"] = (string)requestData["profile"]; |
| 1546 | } | 1546 | } |
| 1547 | 1547 | ||
| 1548 | if (requestData["noassets"].ToString() == "true") | 1548 | if ((string)requestData["noassets"] == "true") |
| 1549 | { | 1549 | { |
| 1550 | options["noassets"] = (string)requestData["noassets"] ; | 1550 | options["noassets"] = (string)requestData["noassets"] ; |
| 1551 | } | 1551 | } |