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

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
This commit is contained in:
Melanie
2012-01-06 00:08:18 +00:00
parent e9296721c7 b06d878790
commit fdfc4ab2a8
13 changed files with 571 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs
View File

@@ -30,8 +30,7 @@ using OpenMetaverse;
using OpenMetaverse.Assets;
namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
{
{
/// <summary>
/// This implements the methods needed to operate on individual inventory items.
/// </summary>
@@ -39,6 +38,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
{
int Type { get; }
UUID AssetID { get; }
T RetrieveAsset<T>() where T : Asset, new();
T RetrieveAsset<T>() where T : OpenMetaverse.Assets.Asset, new();
}
}