aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-21 00:05:33 +0000
committerMelanie Thielker2008-09-21 00:05:33 +0000
commit70be30fbaa6f41ae3849eb33fb23aebdeb02e3b8 (patch)
treea2ef0880cfec743a4b935bac579f2345886685b6
parentEXPERIMENTAL: Early commit of new Script Engine Component System (diff)
downloadopensim-SC_OLD-70be30fbaa6f41ae3849eb33fb23aebdeb02e3b8.zip
opensim-SC_OLD-70be30fbaa6f41ae3849eb33fb23aebdeb02e3b8.tar.gz
opensim-SC_OLD-70be30fbaa6f41ae3849eb33fb23aebdeb02e3b8.tar.bz2
opensim-SC_OLD-70be30fbaa6f41ae3849eb33fb23aebdeb02e3b8.tar.xz
Completely revert the notecard uploading changes I made, since they
appear to break script saves in prims for some.
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs7
2 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index d42c055..a0c59ad 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -170,8 +170,6 @@ namespace OpenSim.Framework.Communications.Capabilities
170 m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"]; 170 m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"];
171 m_capsHandlers["UpdateScriptTaskInventory"] = 171 m_capsHandlers["UpdateScriptTaskInventory"] =
172 new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory); 172 new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory);
173 // LL doesn't offer this
174 // m_capsHandlers["UpdateNotecardTaskInventory"] = m_capsHandlers["UpdateScriptTaskInventory"];
175 173
176 // justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and 174 // justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and
177 // subsequent inventory breakage, in the edit object pane (such as mantis 1085). This requires 175 // 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 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);
1238System.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);