diff options
author | Teravus Ovares | 2009-07-25 15:49:10 +0000 |
---|---|---|
committer | Teravus Ovares | 2009-07-25 15:49:10 +0000 |
commit | 64bd9a335444379ebe1cad8e34d5b5953a76f671 (patch) | |
tree | 66b9ce07dbf95e4c118e3d639068e2c44fc52f58 /OpenSim/Region/OptionalModules/Scripting | |
parent | * Apply http://opensimulator.org/mantis/view.php?id=3586 (diff) | |
download | opensim-SC-64bd9a335444379ebe1cad8e34d5b5953a76f671.zip opensim-SC-64bd9a335444379ebe1cad8e34d5b5953a76f671.tar.gz opensim-SC-64bd9a335444379ebe1cad8e34d5b5953a76f671.tar.bz2 opensim-SC-64bd9a335444379ebe1cad8e34d5b5953a76f671.tar.xz |
* Updates libOMV to version 0.7.0
* Uses mantis #3811 as a base (thanks jhuliman) with changes.
* E-mail regarding interface changes sent to the opensim-dev list
* Archive: https://lists.berlios.de/pipermail/opensim-dev/2009-July/007219.html
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs index 208ddb0..5fac189 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | using OpenMetaverse.Assets; | ||
30 | 31 | ||
31 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | 32 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule |
32 | { | 33 | { |
@@ -38,6 +39,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
38 | { | 39 | { |
39 | int Type { get; } | 40 | int Type { get; } |
40 | UUID AssetID { get; } | 41 | UUID AssetID { get; } |
41 | T RetreiveAsset<T>() where T : OpenMetaverse.Asset, new(); | 42 | T RetreiveAsset<T>() where T : Asset, new(); |
42 | } | 43 | } |
43 | } | 44 | } |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs index b9c0065..40693ab 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs | |||
@@ -32,6 +32,7 @@ using OpenSim.Framework; | |||
32 | using OpenSim.Region.Framework.Scenes; | 32 | using OpenSim.Region.Framework.Scenes; |
33 | //using OpenSim.Services.AssetService; | 33 | //using OpenSim.Services.AssetService; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenMetaverse.Assets; | ||
35 | 36 | ||
36 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | 37 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule |
37 | { | 38 | { |
@@ -80,7 +81,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
80 | public int Type { get { return m_privateItem.Type; } } | 81 | public int Type { get { return m_privateItem.Type; } } |
81 | public UUID AssetID { get { return m_privateItem.AssetID; } } | 82 | public UUID AssetID { get { return m_privateItem.AssetID; } } |
82 | 83 | ||
83 | public T RetreiveAsset<T>() where T : OpenMetaverse.Asset, new() | 84 | public T RetreiveAsset<T>() where T : OpenMetaverse.Assets.Asset, new() |
84 | { | 85 | { |
85 | AssetBase a = m_rootSceene.AssetService.Get(AssetID.ToString()); | 86 | AssetBase a = m_rootSceene.AssetService.Get(AssetID.ToString()); |
86 | T result = new T(); | 87 | T result = new T(); |