diff options
| author | Melanie | 2010-11-23 14:03:52 +0000 |
|---|---|---|
| committer | Melanie | 2010-11-23 14:03:52 +0000 |
| commit | 2527aeb40c5752016524e10797a6d09b4e6816af (patch) | |
| tree | e425b306aa311c639115904df9a68241078b1689 /OpenSim/Framework | |
| parent | Fix more potential nullrefs (diff) | |
| parent | Initialize InventoryItemBase.creatorData properly. Could throw. (diff) | |
| download | opensim-SC-2527aeb40c5752016524e10797a6d09b4e6816af.zip opensim-SC-2527aeb40c5752016524e10797a6d09b4e6816af.tar.gz opensim-SC-2527aeb40c5752016524e10797a6d09b4e6816af.tar.bz2 opensim-SC-2527aeb40c5752016524e10797a6d09b4e6816af.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -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; } |