diff options
author | Melanie Thielker | 2008-09-20 20:56:39 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-09-20 20:56:39 +0000 |
commit | 82d79e3b0bfa73ed3682c61e14b12471631eda93 (patch) | |
tree | ccdf4a9744ef8b501b872510f9a2c1351be5ef11 /OpenSim/Region/Environment | |
parent | XEngine: Fix loading lists from saved state (diff) | |
download | opensim-SC_OLD-82d79e3b0bfa73ed3682c61e14b12471631eda93.zip opensim-SC_OLD-82d79e3b0bfa73ed3682c61e14b12471631eda93.tar.gz opensim-SC_OLD-82d79e3b0bfa73ed3682c61e14b12471631eda93.tar.bz2 opensim-SC_OLD-82d79e3b0bfa73ed3682c61e14b12471631eda93.tar.xz |
Partially implement notecard saves in task inventory. Still makes the
notecard go read-only, but changes are saved.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 5d55075..f5ac035 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)AssetType.LSLText, data); | 257 | AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)item.Type, data); |
258 | AssetCache.AddAsset(asset); | 258 | AssetCache.AddAsset(asset); |
259 | 259 | ||
260 | if (isScriptRunning) | 260 | if (isScriptRunning && item.Type == 10) |
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) | 270 | if (isScriptRunning && item.Type == 10) |
271 | { | 271 | { |
272 | part.CreateScriptInstance(item.ItemID, 0, false); | 272 | part.CreateScriptInstance(item.ItemID, 0, false); |
273 | } | 273 | } |