diff options
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index f5ac035..f575ecd 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -254,10 +254,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
254 | return; | 254 | return; |
255 | } | 255 | } |
256 | 256 | ||
257 | AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)item.Type, data); | 257 | AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)AssetType.LSLText, data); |
258 | AssetCache.AddAsset(asset); | 258 | AssetCache.AddAsset(asset); |
259 | 259 | ||
260 | if (isScriptRunning && item.Type == 10) | 260 | if (isScriptRunning) |
261 | { | 261 | { |
262 | part.RemoveScriptInstance(item.ItemID); | 262 | part.RemoveScriptInstance(item.ItemID); |
263 | } | 263 | } |
@@ -267,7 +267,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
267 | part.GetProperties(remoteClient); | 267 | part.GetProperties(remoteClient); |
268 | 268 | ||
269 | // Trigger rerunning of script (use TriggerRezScript event, see RezScript) | 269 | // Trigger rerunning of script (use TriggerRezScript event, see RezScript) |
270 | if (isScriptRunning && item.Type == 10) | 270 | if (isScriptRunning) |
271 | { | 271 | { |
272 | part.CreateScriptInstance(item.ItemID, 0, false); | 272 | part.CreateScriptInstance(item.ItemID, 0, false); |
273 | } | 273 | } |
@@ -1235,6 +1235,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1235 | else // Updating existing item with new perms etc | 1235 | else // Updating existing item with new perms etc |
1236 | { | 1236 | { |
1237 | TaskInventoryItem prevItem = part.GetInventoryItem(itemID); | 1237 | TaskInventoryItem prevItem = part.GetInventoryItem(itemID); |
1238 | System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.ToString(), itemInfo.AssetID.ToString()); | ||
1238 | itemInfo.AssetID = prevItem.AssetID; | 1239 | itemInfo.AssetID = prevItem.AssetID; |
1239 | if (part.UpdateInventoryItem(itemInfo)) | 1240 | if (part.UpdateInventoryItem(itemInfo)) |
1240 | part.GetProperties(remoteClient); | 1241 | part.GetProperties(remoteClient); |