diff options
author | Melanie | 2010-11-23 14:05:09 +0000 |
---|---|---|
committer | Melanie | 2010-11-23 14:05:09 +0000 |
commit | 6557d5f3596e6b187131f3dec325104d79b5eef7 (patch) | |
tree | e20aea5c5e7127cf2548126c04db77ac5a43dd22 /OpenSim/Framework | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-6557d5f3596e6b187131f3dec325104d79b5eef7.zip opensim-SC_OLD-6557d5f3596e6b187131f3dec325104d79b5eef7.tar.gz opensim-SC_OLD-6557d5f3596e6b187131f3dec325104d79b5eef7.tar.bz2 opensim-SC_OLD-6557d5f3596e6b187131f3dec325104d79b5eef7.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-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; } |