aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs6
2 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index a0c59ad..a891517 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -168,8 +168,9 @@ namespace OpenSim.Framework.Communications.Capabilities
168 m_capsHandlers["UpdateNotecardAgentInventory"] = 168 m_capsHandlers["UpdateNotecardAgentInventory"] =
169 new RestStreamHandler("POST", capsBase + m_notecardUpdatePath, NoteCardAgentInventory); 169 new RestStreamHandler("POST", capsBase + m_notecardUpdatePath, NoteCardAgentInventory);
170 m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"]; 170 m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"];
171 m_capsHandlers["UpdateScriptTaskInventory"] = 171 m_capsHandlers["UpdateNotecardTaskInventory"] =
172 new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory); 172 new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory);
173 m_capsHandlers["UpdateScriptTaskInventory"] = m_capsHandlers["UpdateNotecardTaskInventory"];
173 174
174 // justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and 175 // justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and
175 // subsequent inventory breakage, in the edit object pane (such as mantis 1085). This requires 176 // subsequent inventory breakage, in the edit object pane (such as mantis 1085). This requires
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 }