diff options
| author | Diva Canto | 2013-07-30 22:07:33 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-30 22:07:33 -0700 |
| commit | 3c540f0d33894060d53616aa0aa67bc9d8ab82ec (patch) | |
| tree | 02d2e705d3f832eb2ad3ab657177982cdc8b871d /OpenSim | |
| parent | Fix null ref. (diff) | |
| download | opensim-SC_OLD-3c540f0d33894060d53616aa0aa67bc9d8ab82ec.zip opensim-SC_OLD-3c540f0d33894060d53616aa0aa67bc9d8ab82ec.tar.gz opensim-SC_OLD-3c540f0d33894060d53616aa0aa67bc9d8ab82ec.tar.bz2 opensim-SC_OLD-3c540f0d33894060d53616aa0aa67bc9d8ab82ec.tar.xz | |
Avoid another null ref opportunity.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs index a7dd44e..a2aee08 100644 --- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs +++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | |||
| @@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid | |||
| 146 | 146 | ||
| 147 | private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features) | 147 | private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features) |
| 148 | { | 148 | { |
| 149 | if (m_UserManagement != null && !m_UserManagement.IsLocalGridUser(agentID) && m_MapImageServerURL != string.Empty) | 149 | if (m_UserManagement != null && !string.IsNullOrEmpty(m_MapImageServerURL) && !m_UserManagement.IsLocalGridUser(agentID)) |
| 150 | { | 150 | { |
| 151 | OSD extras = new OSDMap(); | 151 | OSD extras = new OSDMap(); |
| 152 | if (features.ContainsKey("OpenSimExtras")) | 152 | if (features.ContainsKey("OpenSimExtras")) |