diff options
| author | Melanie | 2010-01-04 21:41:33 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-04 21:41:33 +0000 |
| commit | 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch) | |
| tree | badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/ApplicationPlugins | |
| parent | Forgot to add these to the grid configs, so that logins work. (diff) | |
| parent | Finish conversion if XInventoryService (diff) | |
| download | opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz | |
Merge branch 'master' into presence-refactor
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 adf7967..9400788 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -322,8 +322,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 322 | if (Uri.TryCreate(file, UriKind.RelativeOrAbsolute, out result)) | 322 | if (Uri.TryCreate(file, UriKind.RelativeOrAbsolute, out result)) |
| 323 | { | 323 | { |
| 324 | // the url is valid | 324 | // the url is valid |
| 325 | string fileType = file.Substring(file.LastIndexOf('/') + 1); | 325 | string fileType = file.Substring(file.LastIndexOf('/') + 1); |
| 326 | terrainModule.LoadFromStream(fileType, result); | 326 | terrainModule.LoadFromStream(fileType, result); |
| 327 | } | 327 | } |
| 328 | } | 328 | } |
| 329 | else | 329 | else |