diff options
author | Diva Canto | 2011-05-06 09:56:27 -0700 |
---|---|---|
committer | Diva Canto | 2011-05-06 09:58:27 -0700 |
commit | 6077c114b62579c970323d6ba5fe38d4f3599057 (patch) | |
tree | ae14c46aa3748548dd8cc4d7d4a57ad43c465ae7 | |
parent | Bug fix: iars under Library weren't being loaded. (diff) | |
download | opensim-SC_OLD-6077c114b62579c970323d6ba5fe38d4f3599057.zip opensim-SC_OLD-6077c114b62579c970323d6ba5fe38d4f3599057.tar.gz opensim-SC_OLD-6077c114b62579c970323d6ba5fe38d4f3599057.tar.bz2 opensim-SC_OLD-6077c114b62579c970323d6ba5fe38d4f3599057.tar.xz |
One more bug fix concerning library items that weren't being copied to user's inventory. Also commented verbose debug message.
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 0f7f666..6aa4b40 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -5890,7 +5890,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5890 | AvatarWearingArgs wearingArgs = new AvatarWearingArgs(); | 5890 | AvatarWearingArgs wearingArgs = new AvatarWearingArgs(); |
5891 | for (int i = 0; i < nowWearing.WearableData.Length; i++) | 5891 | for (int i = 0; i < nowWearing.WearableData.Length; i++) |
5892 | { | 5892 | { |
5893 | m_log.DebugFormat("[XXX]: Wearable type {0} item {1}", nowWearing.WearableData[i].WearableType, nowWearing.WearableData[i].ItemID); | 5893 | //m_log.DebugFormat("[XXX]: Wearable type {0} item {1}", nowWearing.WearableData[i].WearableType, nowWearing.WearableData[i].ItemID); |
5894 | AvatarWearingArgs.Wearable wearable = | 5894 | AvatarWearingArgs.Wearable wearable = |
5895 | new AvatarWearingArgs.Wearable(nowWearing.WearableData[i].ItemID, | 5895 | new AvatarWearingArgs.Wearable(nowWearing.WearableData[i].ItemID, |
5896 | nowWearing.WearableData[i].WearableType); | 5896 | nowWearing.WearableData[i].WearableType); |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index b0f0de6..cd01a05 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -713,7 +713,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
713 | newName = item.Name; | 713 | newName = item.Name; |
714 | } | 714 | } |
715 | 715 | ||
716 | if (remoteClient.AgentId == oldAgentID) | 716 | if (remoteClient.AgentId == oldAgentID || (LibraryService != null && LibraryService.LibraryRootFolder != null && oldAgentID == LibraryService.LibraryRootFolder.Owner)) |
717 | { | 717 | { |
718 | CreateNewInventoryItem( | 718 | CreateNewInventoryItem( |
719 | remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType, | 719 | remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType, |