Merge branch 'master' of opensimulator.org:/var/git/opensim

LSLKeyTest
Melanie Thielker 2016-05-23 19:20:05 +02:00
commit 08bd80f5f4
4 changed files with 14 additions and 4 deletions

View File

@ -121,6 +121,7 @@ namespace OpenSim.Framework.Monitoring
Thread thread = new Thread(start);
thread.Priority = priority;
thread.IsBackground = isBackground;
thread.Name = name;
Watchdog.ThreadWatchdogInfo twi
= new Watchdog.ThreadWatchdogInfo(thread, timeout, name)
@ -129,7 +130,7 @@ namespace OpenSim.Framework.Monitoring
Watchdog.AddThread(twi, name, log:log);
thread.Start();
thread.Name = name;
return thread;
}

View File

@ -187,6 +187,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
InventoryFolderBase f = new InventoryFolderBase(folderID, remoteClient.AgentId);
InventoryFolderBase folder = m_Scene.InventoryService.GetFolder(f);
if (folder == null && Enum.IsDefined(typeof(FolderType), (sbyte)invType))
{
folder = m_Scene.InventoryService.GetFolderForType(remoteClient.AgentId, (FolderType)invType);
if (folder != null)
m_log.DebugFormat("[INVENTORY ACCESS MODULE]: Requested folder not found but found folder for type {0}", invType);
}
if (folder == null || folder.Owner != remoteClient.AgentId)
return;

View File

@ -219,6 +219,7 @@ namespace OpenSim.Region.Framework.Scenes
// position).
//
// Therefore, JointMoved and JointDeactivated events will be fired as a result of the following Simulate().
return PhysicsScene.Simulate((float)elapsed);
}

View File

@ -689,8 +689,9 @@ namespace Amib.Threading
#if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
workerThread.Priority = _stpStartInfo.ThreadPriority;
#endif
workerThread.Start();
workerThread.Name = string.Format("STP:{0}:{1}", Name, _threadCounter);
workerThread.Start();
++_threadCounter;
// Add it to the dictionary and update its creation time.