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/Framework/InventoryItemBase.cs | |
| parent | Merge branch 'master' into varregion (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.zip opensim-SC-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.gz opensim-SC-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.bz2 opensim-SC-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Framework/InventoryItemBase.cs')
| -rw-r--r-- | OpenSim/Framework/InventoryItemBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs index 3d45e76..558dfd0 100644 --- a/OpenSim/Framework/InventoryItemBase.cs +++ b/OpenSim/Framework/InventoryItemBase.cs | |||
| @@ -122,7 +122,7 @@ namespace OpenSim.Framework | |||
| 122 | { | 122 | { |
| 123 | get | 123 | get |
| 124 | { | 124 | { |
| 125 | if (m_creatorData != null && m_creatorData != string.Empty) | 125 | if (!string.IsNullOrEmpty(m_creatorData)) |
| 126 | return m_creatorId + ';' + m_creatorData; | 126 | return m_creatorId + ';' + m_creatorData; |
| 127 | else | 127 | else |
| 128 | return m_creatorId; | 128 | return m_creatorId; |