aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorlbsa712008-02-11 13:26:55 +0000
committerlbsa712008-02-11 13:26:55 +0000
commitc927928245fcd2c0b028029587d91b34ff145d91 (patch)
tree7aaa930f611e29d26e89f03408cc1a9151e703cd /OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
parentFrom: Ansgar Schmidt <ANSI@de.ibm.com> (diff)
downloadopensim-SC_OLD-c927928245fcd2c0b028029587d91b34ff145d91.zip
opensim-SC_OLD-c927928245fcd2c0b028029587d91b34ff145d91.tar.gz
opensim-SC_OLD-c927928245fcd2c0b028029587d91b34ff145d91.tar.bz2
opensim-SC_OLD-c927928245fcd2c0b028029587d91b34ff145d91.tar.xz
* some refactoring on permissions
* temporary re-introduced the weird 'flip-back' behaviour, but debugging it; will remove it if I don't find anything.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs6
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 fee1e66..16f15a2 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -199,7 +199,7 @@ namespace OpenSim.Region.Environment.Scenes
199 // Update item with new asset 199 // Update item with new asset
200 item.AssetID = asset.FullID; 200 item.AssetID = asset.FullID;
201 group.UpdateInventoryItem(item); 201 group.UpdateInventoryItem(item);
202 group.GetProperites(remoteClient); 202 group.GetProperties(remoteClient);
203 203
204 // Trigger rerunning of script (use TriggerRezScript event, see RezScript) 204 // Trigger rerunning of script (use TriggerRezScript event, see RezScript)
205 if (isScriptRunning) 205 if (isScriptRunning)
@@ -520,7 +520,7 @@ namespace OpenSim.Region.Environment.Scenes
520 if (group != null) 520 if (group != null)
521 { 521 {
522 int type = group.RemoveInventoryItem(localID, itemID); 522 int type = group.RemoveInventoryItem(localID, itemID);
523 group.GetProperites(remoteClient); 523 group.GetProperties(remoteClient);
524 if (type == 10) 524 if (type == 10)
525 { 525 {
526 EventManager.TriggerRemoveScript(localID, itemID); 526 EventManager.TriggerRemoveScript(localID, itemID);
@@ -599,7 +599,7 @@ namespace OpenSim.Region.Environment.Scenes
599 { 599 {
600 group.AddInventoryItem(remoteClient, localID, item, copyID); 600 group.AddInventoryItem(remoteClient, localID, item, copyID);
601 group.StartScript(localID, copyID); 601 group.StartScript(localID, copyID);
602 group.GetProperites(remoteClient); 602 group.GetProperties(remoteClient);
603 603
604 // m_log.Info( 604 // m_log.Info(
605 // String.Format("[PRIMINVENTORY]: " + 605 // String.Format("[PRIMINVENTORY]: " +