ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-core' into mantis5110

Browse Source
This commit is contained in:
Jonathan Freedman
2010-11-23 22:27:54 -08:00
parent b7f5e82843 a1daeb277e
commit bc51dfc45e
17 changed files with 307 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/Capabilities/Caps.cs
View File

@@ -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;

2
OpenSim/Framework/InventoryItemBase.cs
View File

@@ -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; }