diff options
| author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
| commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
| tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Services/HypergridService/HGInventoryService.cs | |
| parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Services/HypergridService/HGInventoryService.cs')
| -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; |