From 7796b90ebb434b4fa32757567b06e595dea4e97d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 23 Nov 2010 14:02:06 +0000
Subject: Fix some crashes caused by the addition of the CreatorData column

---
 OpenSim/Framework/Capabilities/Caps.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 7b0e053..e7f2e13 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -967,6 +967,7 @@ namespace OpenSim.Framework.Capabilities
             InventoryItemBase item = new InventoryItemBase();
             item.Owner = m_agentID;
             item.CreatorId = m_agentID.ToString();
+            item.CreatorData = String.Empty;
             item.ID = inventoryItem;
             item.AssetID = asset.FullID;
             item.Description = assetDescription;
-- 
cgit v1.1


From 61a49ec4a8d6e0466d6aa8363b7012dc4e6eab9f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 23 Nov 2010 06:36:57 -0800
Subject: Initialize InventoryItemBase.creatorData properly. Could throw.

---
 OpenSim/Framework/InventoryItemBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework')

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
         }
         protected UUID m_creatorIdAsUuid = UUID.Zero;
 
-        protected string m_creatorData;
+        protected string m_creatorData = string.Empty;
         public string CreatorData // = <profile url>;<name>
         {
             get { return m_creatorData; }
-- 
cgit v1.1