OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into bulletsim4

user_profiles
Robert Adams 2013-05-02 07:02:28 -07:00
parent ed46b42fea 4cb73192a7
commit a9480aed85
27 changed files with 6369 additions and 6362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@ -646,11 +646,12 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
} }
else else
{ {
if (remoteClient == null || so.OwnerID != remoteClient.AgentId) if (remoteClient == null || so.RootPart.OwnerID != remoteClient.AgentId)
{ {
// Taking copy of another person's item. Take to // Taking copy of another person's item. Take to
// Objects folder. // Objects folder.
folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object); folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object);
so.FromFolderID = UUID.Zero;
} }
else else
{ {
@ -666,10 +667,16 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
// //
if (action == DeRezAction.Take || action == DeRezAction.TakeCopy) if (action == DeRezAction.Take || action == DeRezAction.TakeCopy)
{ {
if (so.FromFolderID != UUID.Zero && userID == remoteClient.AgentId) if (so.FromFolderID != UUID.Zero && so.RootPart.OwnerID == remoteClient.AgentId)
{ {
InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID); InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID);
folder = m_Scene.InventoryService.GetFolder(f); folder = m_Scene.InventoryService.GetFolder(f);
if(folder.Type == 14 || folder.Type == 16)
{
// folder.Type = 6;
folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object);
}
} }
} }

2
ThirdParty/SmartThreadPool/InternalInterfaces.cs vendored
View File

@ -1,4 +1,4 @@

namespace Amib.Threading.Internal namespace Amib.Threading.Internal
{ {
/// <summary> /// <summary>

2
ThirdParty/SmartThreadPool/Properties/AssemblyInfo.cs vendored
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
ThirdParty/SmartThreadPool/SLExt.cs vendored
View File

@ -1,4 +1,4 @@
#if _SILVERLIGHT #if _SILVERLIGHT
using System.Threading; using System.Threading;

2
ThirdParty/SmartThreadPool/STPEventWaitHandle.cs vendored
View File

@ -1,4 +1,4 @@
#if !(_WINDOWS_CE) #if !(_WINDOWS_CE)
using System; using System;
using System.Threading; using System.Threading;

2
ThirdParty/SmartThreadPool/SmartThreadPool.ThreadEntry.cs vendored
View File

@ -1,4 +1,4 @@

using System; using System;
using Amib.Threading.Internal; using Amib.Threading.Internal;

2
ThirdParty/SmartThreadPool/WorkItem.WorkItemResult.cs vendored
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Threading; using System.Threading;

2
bin/Robust.HG.ini.example
View File

@ -35,7 +35,7 @@
; Modular configurations ; Modular configurations
; Set path to directory for modular ini files... ; Set path to directory for modular ini files...
; The Robust.exe process must have R/W access to the location ; The Robust.exe process must have R/W access to the location
ConfigDirectory = "/home/opensim/etc/Configs" ConfigDirectory = "."
[ServiceList] [ServiceList]

2
bin/Robust.ini.example
View File

@ -27,7 +27,7 @@
; Modular configurations ; Modular configurations
; Set path to directory for modular ini files... ; Set path to directory for modular ini files...
; The Robust.exe process must have R/W access to the location ; The Robust.exe process must have R/W access to the location
ConfigDirectory = "/home/opensim/etc/Configs" ConfigDirectory = "."
[ServiceList] [ServiceList]
AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector" AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"