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/TaskInventoryItem.cs | |
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/Framework/TaskInventoryItem.cs')
-rw-r--r-- | OpenSim/Framework/TaskInventoryItem.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs index a06f8e7..307cb75 100644 --- a/OpenSim/Framework/TaskInventoryItem.cs +++ b/OpenSim/Framework/TaskInventoryItem.cs | |||
@@ -124,7 +124,7 @@ namespace OpenSim.Framework | |||
124 | { | 124 | { |
125 | get | 125 | get |
126 | { | 126 | { |
127 | if (_creatorData != null && _creatorData != string.Empty) | 127 | if (!string.IsNullOrEmpty(_creatorData)) |
128 | return _creatorID.ToString() + ';' + _creatorData; | 128 | return _creatorID.ToString() + ';' + _creatorData; |
129 | else | 129 | else |
130 | return _creatorID.ToString(); | 130 | return _creatorID.ToString(); |