diff options
| author | Robert Adams | 2013-11-15 14:56:13 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-11-15 14:56:13 -0800 |
| commit | 604b39cea908029c80aa8ee5ff3aee5c8000c0e4 (patch) | |
| tree | bea875d6651531a030630e161b658c74d3aaf357 /OpenSim/Services | |
| parent | Merge branch 'master' into varregion (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.zip opensim-SC_OLD-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.gz opensim-SC_OLD-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.bz2 opensim-SC_OLD-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/HypergridService/HGInventoryService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs index 326e68d..3233caf 100644 --- a/OpenSim/Services/HypergridService/HGInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGInventoryService.cs | |||
| @@ -298,7 +298,7 @@ namespace OpenSim.Services.HypergridService | |||
| 298 | UserAccount user = m_Cache.GetUser(it.CreatorId); | 298 | UserAccount user = m_Cache.GetUser(it.CreatorId); |
| 299 | 299 | ||
| 300 | // Adjust the creator data | 300 | // Adjust the creator data |
| 301 | if (user != null && it != null && (it.CreatorData == null || it.CreatorData == string.Empty)) | 301 | if (user != null && it != null && string.IsNullOrEmpty(it.CreatorData)) |
| 302 | it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName; | 302 | it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName; |
| 303 | } | 303 | } |
| 304 | return it; | 304 | return it; |