diff options
| author | Kitto Flora | 2010-01-03 23:10:01 -0500 |
|---|---|---|
| committer | Kitto Flora | 2010-01-03 23:10:01 -0500 |
| commit | 253e2ed699a899b74451ac51ed7875b3f98ffdd7 (patch) | |
| tree | 8760330fd19b8ae367b79dd63408b33618c4eff2 /OpenSim/ApplicationPlugins | |
| parent | Vehicle Linear parameter adjustments (diff) | |
| parent | Solve conflict (diff) | |
| download | opensim-SC_OLD-253e2ed699a899b74451ac51ed7875b3f98ffdd7.zip opensim-SC_OLD-253e2ed699a899b74451ac51ed7875b3f98ffdd7.tar.gz opensim-SC_OLD-253e2ed699a899b74451ac51ed7875b3f98ffdd7.tar.bz2 opensim-SC_OLD-253e2ed699a899b74451ac51ed7875b3f98ffdd7.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to '')
| -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 |