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

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

LSLKeyTest
Melanie Thielker 2016-05-23 19:20:05 +02:00
parent 527ea6af02 057d1b2a6e
commit 08bd80f5f4
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/Monitoring/WorkManager.cs
View File

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

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

@ -187,6 +187,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
InventoryFolderBase f = new InventoryFolderBase(folderID, remoteClient.AgentId); InventoryFolderBase f = new InventoryFolderBase(folderID, remoteClient.AgentId);
InventoryFolderBase folder = m_Scene.InventoryService.GetFolder(f); 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) if (folder == null || folder.Owner != remoteClient.AgentId)
return; return;

1
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

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

5
ThirdParty/SmartThreadPool/SmartThreadPool.cs vendored
View File

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