diff options
author | opensim mirror account | 2010-11-23 06:40:21 -0800 |
---|---|---|
committer | opensim mirror account | 2010-11-23 06:40:21 -0800 |
commit | 32cbf0c542b8a392ba86b18d1959ef79c283f679 (patch) | |
tree | 5231f6322a1dcfe852123c82f8c2a6cf4f8c42d8 /OpenSim | |
parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
parent | Initialize InventoryItemBase.creatorData properly. Could throw. (diff) | |
download | opensim-SC-32cbf0c542b8a392ba86b18d1959ef79c283f679.zip opensim-SC-32cbf0c542b8a392ba86b18d1959ef79c283f679.tar.gz opensim-SC-32cbf0c542b8a392ba86b18d1959ef79c283f679.tar.bz2 opensim-SC-32cbf0c542b8a392ba86b18d1959ef79c283f679.tar.xz |
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim')
-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 ce4fc38..a663680 100644 --- a/OpenSim/Framework/InventoryItemBase.cs +++ b/OpenSim/Framework/InventoryItemBase.cs | |||
@@ -117,7 +117,7 @@ namespace OpenSim.Framework | |||
117 | } | 117 | } |
118 | protected UUID m_creatorIdAsUuid = UUID.Zero; | 118 | protected UUID m_creatorIdAsUuid = UUID.Zero; |
119 | 119 | ||
120 | protected string m_creatorData; | 120 | protected string m_creatorData = string.Empty; |
121 | public string CreatorData // = <profile url>;<name> | 121 | public string CreatorData // = <profile url>;<name> |
122 | { | 122 | { |
123 | get { return m_creatorData; } | 123 | get { return m_creatorData; } |