diff options
| author | Melanie | 2010-01-03 21:43:39 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-03 21:43:39 +0000 |
| commit | 61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11 (patch) | |
| tree | 7780b88dc26de91fe0b95a0a234a7f995adf5d22 /OpenSim/ApplicationPlugins/RemoteController | |
| parent | Add virtual method StateChange to ScriptBaseClass (diff) | |
| parent | Cause llSetText to send prim updates. (diff) | |
| download | opensim-SC-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.zip opensim-SC-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.gz opensim-SC-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.bz2 opensim-SC-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
| -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 b22003c..87eae1e 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -420,8 +420,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 420 | if (Uri.TryCreate(file, UriKind.RelativeOrAbsolute, out result)) | 420 | if (Uri.TryCreate(file, UriKind.RelativeOrAbsolute, out result)) |
| 421 | { | 421 | { |
| 422 | // the url is valid | 422 | // the url is valid |
| 423 | string fileType = file.Substring(file.LastIndexOf('/') + 1); | 423 | string fileType = file.Substring(file.LastIndexOf('/') + 1); |
| 424 | terrainModule.LoadFromStream(fileType, result); | 424 | terrainModule.LoadFromStream(fileType, result); |
| 425 | } | 425 | } |
| 426 | } | 426 | } |
| 427 | else | 427 | else |