diff options
| author | Diva Canto | 2015-01-22 10:45:07 -0800 |
|---|---|---|
| committer | Diva Canto | 2015-01-22 10:45:07 -0800 |
| commit | 185e7048c8dc51fe0705bd26728440cf361564c7 (patch) | |
| tree | ad511bf343759b296fd3315a51999121a3d192f0 | |
| parent | minor: In AttachmentsModule.UpdateKnownItem use the existing IInventoryAccess... (diff) | |
| download | opensim-SC_OLD-185e7048c8dc51fe0705bd26728440cf361564c7.zip opensim-SC_OLD-185e7048c8dc51fe0705bd26728440cf361564c7.tar.gz opensim-SC_OLD-185e7048c8dc51fe0705bd26728440cf361564c7.tar.bz2 opensim-SC_OLD-185e7048c8dc51fe0705bd26728440cf361564c7.tar.xz | |
On the GridService, the central simulator features: ensure that the map tile url ends with '/' because the viewer is dumb and just appends to it.
| -rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 3b1a07e..af7a511 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
| @@ -164,8 +164,14 @@ namespace OpenSim.Services.GridService | |||
| 164 | 164 | ||
| 165 | configVal = loginConfig.GetString("MapTileURL", string.Empty); | 165 | configVal = loginConfig.GetString("MapTileURL", string.Empty); |
| 166 | if (!string.IsNullOrEmpty(configVal)) | 166 | if (!string.IsNullOrEmpty(configVal)) |
| 167 | { | ||
| 168 | // This URL must end with '/', the viewer doesn't check | ||
| 169 | configVal = configVal.Trim(); | ||
| 170 | if (!configVal.EndsWith("/")) | ||
| 171 | configVal = configVal + "/"; | ||
| 167 | m_ExtraFeatures["map-server-url"] = configVal; | 172 | m_ExtraFeatures["map-server-url"] = configVal; |
| 168 | 173 | } | |
| 174 | |||
| 169 | configVal = loginConfig.GetString("DestinationGuide", string.Empty); | 175 | configVal = loginConfig.GetString("DestinationGuide", string.Empty); |
| 170 | if (!string.IsNullOrEmpty(configVal)) | 176 | if (!string.IsNullOrEmpty(configVal)) |
| 171 | m_ExtraFeatures["destination-guide-url"] = configVal; | 177 | m_ExtraFeatures["destination-guide-url"] = configVal; |