aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMW2007-12-01 21:16:42 +0000
committerMW2007-12-01 21:16:42 +0000
commit96ac8f00c7158adcf141c41bf7707b76fb544e1b (patch)
treec030cb690ed90cc73c7ae8f5eebd7667a01fc09a /OpenSim/Region
parentas a Test, attempted to disable mysql inventory table auto creation. (diff)
downloadopensim-SC_OLD-96ac8f00c7158adcf141c41bf7707b76fb544e1b.zip
opensim-SC_OLD-96ac8f00c7158adcf141c41bf7707b76fb544e1b.tar.gz
opensim-SC_OLD-96ac8f00c7158adcf141c41bf7707b76fb544e1b.tar.bz2
opensim-SC_OLD-96ac8f00c7158adcf141c41bf7707b76fb544e1b.tar.xz
Due to popular demand, a rezzed prim should no longer delete the original inventory item. (hasn't been tested to make sure no conflicts happen if that new rezzed object is then taken back into inventory but don't think there will be any)
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index a2fd01f..368d030 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -473,8 +473,8 @@ namespace OpenSim.Region.Environment.Scenes
473 if (rezAsset != null) 473 if (rezAsset != null)
474 { 474 {
475 AddRezObject(Util.FieldToString(rezAsset.Data), pos); 475 AddRezObject(Util.FieldToString(rezAsset.Data), pos);
476 userInfo.DeleteItem(remoteClient.AgentId, item); 476 //userInfo.DeleteItem(remoteClient.AgentId, item);
477 remoteClient.SendRemoveInventoryItem(itemID); 477 //remoteClient.SendRemoveInventoryItem(itemID);
478 } 478 }
479 } 479 }
480 } 480 }