diff options
| author | Diva Canto | 2011-05-06 09:56:27 -0700 |
|---|---|---|
| committer | Diva Canto | 2011-05-06 09:56:27 -0700 |
| commit | 74e981e796d28f52458acf3ebfc40fbde54e22db (patch) | |
| tree | 4cd53f3ff3f53ad422cef85e9132fe8a254eea68 /OpenSim | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-74e981e796d28f52458acf3ebfc40fbde54e22db.zip opensim-SC_OLD-74e981e796d28f52458acf3ebfc40fbde54e22db.tar.gz opensim-SC_OLD-74e981e796d28f52458acf3ebfc40fbde54e22db.tar.bz2 opensim-SC_OLD-74e981e796d28f52458acf3ebfc40fbde54e22db.tar.xz | |
One more bug fix concerning library items that weren't being copied to user's inventory. Also commented verbose debug message.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/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/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 43903ce..025c6e6 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -5982,7 +5982,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 5982 | AvatarWearingArgs wearingArgs = new AvatarWearingArgs(); | 5982 | AvatarWearingArgs wearingArgs = new AvatarWearingArgs(); |
| 5983 | for (int i = 0; i < nowWearing.WearableData.Length; i++) | 5983 | for (int i = 0; i < nowWearing.WearableData.Length; i++) |
| 5984 | { | 5984 | { |
| 5985 | m_log.DebugFormat("[XXX]: Wearable type {0} item {1}", nowWearing.WearableData[i].WearableType, nowWearing.WearableData[i].ItemID); | 5985 | //m_log.DebugFormat("[XXX]: Wearable type {0} item {1}", nowWearing.WearableData[i].WearableType, nowWearing.WearableData[i].ItemID); |
| 5986 | AvatarWearingArgs.Wearable wearable = | 5986 | AvatarWearingArgs.Wearable wearable = |
| 5987 | new AvatarWearingArgs.Wearable(nowWearing.WearableData[i].ItemID, | 5987 | new AvatarWearingArgs.Wearable(nowWearing.WearableData[i].ItemID, |
| 5988 | nowWearing.WearableData[i].WearableType); | 5988 | 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, |