OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Partially implement notecard saves in task inventory. Still makes the 

notecard go read-only, but changes are saved.
0.6.0-stable
Melanie Thielker 2008-09-20 20:56:39 +00:00
parent 5557fb9dd2
commit 82d79e3b0b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/Communications/Capabilities/Caps.cs
View File

@ -168,8 +168,9 @@ namespace OpenSim.Framework.Communications.Capabilities
m_capsHandlers["UpdateNotecardAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"] =
new RestStreamHandler("POST", capsBase + m_notecardUpdatePath, NoteCardAgentInventory); new RestStreamHandler("POST", capsBase + m_notecardUpdatePath, NoteCardAgentInventory);
m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"]; m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"];
m_capsHandlers["UpdateScriptTaskInventory"] = m_capsHandlers["UpdateNotecardTaskInventory"] =
new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory); new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory);
m_capsHandlers["UpdateScriptTaskInventory"] = m_capsHandlers["UpdateNotecardTaskInventory"];
// justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and // justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and
// subsequent inventory breakage, in the edit object pane (such as mantis 1085). This requires // subsequent inventory breakage, in the edit object pane (such as mantis 1085). This requires

6
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -254,10 +254,10 @@ namespace OpenSim.Region.Environment.Scenes
return; return;
} }
AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)AssetType.LSLText, data); AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)item.Type, data);
AssetCache.AddAsset(asset); AssetCache.AddAsset(asset);
if (isScriptRunning) if (isScriptRunning && item.Type == 10)
{ {
part.RemoveScriptInstance(item.ItemID); part.RemoveScriptInstance(item.ItemID);
} }
@ -267,7 +267,7 @@ namespace OpenSim.Region.Environment.Scenes
part.GetProperties(remoteClient); part.GetProperties(remoteClient);
// Trigger rerunning of script (use TriggerRezScript event, see RezScript) // Trigger rerunning of script (use TriggerRezScript event, see RezScript)
if (isScriptRunning) if (isScriptRunning && item.Type == 10)
{ {
part.CreateScriptInstance(item.ItemID, 0, false); part.CreateScriptInstance(item.ItemID, 0, false);
} }