diff options
| author | Diva Canto | 2015-11-27 08:22:30 -0800 |
|---|---|---|
| committer | Diva Canto | 2015-11-27 08:22:30 -0800 |
| commit | 5b7a585b4f01c18bcee4245a58ac41c3b51f01f5 (patch) | |
| tree | 67b2fd00a9c20c87b83e45318063763799cdc9f8 /OpenSim/Region | |
| parent | Flipped version to 0.9.0.0 (diff) | |
| download | opensim-SC-5b7a585b4f01c18bcee4245a58ac41c3b51f01f5.zip opensim-SC-5b7a585b4f01c18bcee4245a58ac41c3b51f01f5.tar.gz opensim-SC-5b7a585b4f01c18bcee4245a58ac41c3b51f01f5.tar.bz2 opensim-SC-5b7a585b4f01c18bcee4245a58ac41c3b51f01f5.tar.xz | |
Sometimes the viewer sends a null string as mapName; this made the client thread throw an exception with unexpected behavior for users (nothing happens). This commit gives it a sane default: it assumes we're looking for a position in the current region.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 62206e9..5374fa5 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -9104,8 +9104,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 9104 | return true; | 9104 | return true; |
| 9105 | } | 9105 | } |
| 9106 | #endregion | 9106 | #endregion |
| 9107 | string mapName = Util.UTF8.GetString(map.NameData.Name, 0, | 9107 | string mapName = (map.NameData.Name.Length == 0) ? m_scene.RegionInfo.RegionName : |
| 9108 | map.NameData.Name.Length - 1); | 9108 | Util.UTF8.GetString(map.NameData.Name, 0, map.NameData.Name.Length - 1); |
| 9109 | RequestMapName handlerMapNameRequest = OnMapNameRequest; | 9109 | RequestMapName handlerMapNameRequest = OnMapNameRequest; |
| 9110 | if (handlerMapNameRequest != null) | 9110 | if (handlerMapNameRequest != null) |
| 9111 | { | 9111 | { |