Completely revert the notecard uploading changes I made, since they
appear to break script saves in prims for some.0.6.0-stable
parent
752d3f3879
commit
70be30fbaa
|
@ -170,8 +170,6 @@ namespace OpenSim.Framework.Communications.Capabilities
|
||||||
m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"];
|
m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"];
|
||||||
m_capsHandlers["UpdateScriptTaskInventory"] =
|
m_capsHandlers["UpdateScriptTaskInventory"] =
|
||||||
new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory);
|
new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory);
|
||||||
// LL doesn't offer this
|
|
||||||
// m_capsHandlers["UpdateNotecardTaskInventory"] = m_capsHandlers["UpdateScriptTaskInventory"];
|
|
||||||
|
|
||||||
// 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
|
||||||
|
|
|
@ -254,10 +254,10 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)item.Type, data);
|
AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)AssetType.LSLText, data);
|
||||||
AssetCache.AddAsset(asset);
|
AssetCache.AddAsset(asset);
|
||||||
|
|
||||||
if (isScriptRunning && item.Type == 10)
|
if (isScriptRunning)
|
||||||
{
|
{
|
||||||
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 && item.Type == 10)
|
if (isScriptRunning)
|
||||||
{
|
{
|
||||||
part.CreateScriptInstance(item.ItemID, 0, false);
|
part.CreateScriptInstance(item.ItemID, 0, false);
|
||||||
}
|
}
|
||||||
|
@ -1235,6 +1235,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
else // Updating existing item with new perms etc
|
else // Updating existing item with new perms etc
|
||||||
{
|
{
|
||||||
TaskInventoryItem prevItem = part.GetInventoryItem(itemID);
|
TaskInventoryItem prevItem = part.GetInventoryItem(itemID);
|
||||||
|
System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.ToString(), itemInfo.AssetID.ToString());
|
||||||
itemInfo.AssetID = prevItem.AssetID;
|
itemInfo.AssetID = prevItem.AssetID;
|
||||||
if (part.UpdateInventoryItem(itemInfo))
|
if (part.UpdateInventoryItem(itemInfo))
|
||||||
part.GetProperties(remoteClient);
|
part.GetProperties(remoteClient);
|
||||||
|
|
Loading…
Reference in New Issue