aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-28 02:36:40 +0000
committerMelanie Thielker2008-08-28 02:36:40 +0000
commit53f78a10870bc9748b988627292b777678ce3c4e (patch)
tree237cb8b47ca88b1fd98f813808ceb46eaa31c406 /OpenSim/Region
parentRefactor IScriptInstance / IScriptEngine to use a generic IScriptWorkItem, (diff)
downloadopensim-SC_OLD-53f78a10870bc9748b988627292b777678ce3c4e.zip
opensim-SC_OLD-53f78a10870bc9748b988627292b777678ce3c4e.tar.gz
opensim-SC_OLD-53f78a10870bc9748b988627292b777678ce3c4e.tar.bz2
opensim-SC_OLD-53f78a10870bc9748b988627292b777678ce3c4e.tar.xz
Thank you, A_Biondi, for patch to porperly apply the new item name
when copying within agent inventory
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 ffb8501..a12748f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -542,13 +542,13 @@ namespace OpenSim.Region.Environment.Scenes
542 if (remoteClient.AgentId == oldAgentID) 542 if (remoteClient.AgentId == oldAgentID)
543 { 543 {
544 CreateNewInventoryItem( 544 CreateNewInventoryItem(
545 remoteClient, newFolderID, item.Name, item.Flags, callbackID, asset, (sbyte)item.InvType, 545 remoteClient, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType,
546 item.BasePermissions, item.CurrentPermissions, item.EveryOnePermissions, item.NextPermissions, Util.UnixTimeSinceEpoch()); 546 item.BasePermissions, item.CurrentPermissions, item.EveryOnePermissions, item.NextPermissions, Util.UnixTimeSinceEpoch());
547 } 547 }
548 else 548 else
549 { 549 {
550 CreateNewInventoryItem( 550 CreateNewInventoryItem(
551 remoteClient, newFolderID, item.Name, item.Flags, callbackID, asset, (sbyte)item.InvType, 551 remoteClient, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType,
552 item.NextPermissions, item.NextPermissions, item.EveryOnePermissions & item.NextPermissions, item.NextPermissions, Util.UnixTimeSinceEpoch()); 552 item.NextPermissions, item.NextPermissions, item.EveryOnePermissions & item.NextPermissions, item.NextPermissions, Util.UnixTimeSinceEpoch());
553 } 553 }
554 } 554 }