ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-03 09:06:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update svn properties, formatting cleanup.

Browse Source
This commit is contained in:
Jeff Ames
2008-09-09 01:26:48 +00:00
parent 3e1441afe1
commit fae34bb10c
41 changed files with 838 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@@ -7546,7 +7546,7 @@ namespace OpenSim.Region.ScriptEngine.Common
// the object we are in
UUID objectID = m_host.ParentUUID;
if(objectID == UUID.Zero) return;
if (objectID == UUID.Zero) return;
// we need the permission first, to know which avatar we want to set the camera for
UUID agentID = m_host.TaskInventory[invItemID].PermsGranter;
@@ -7597,7 +7597,7 @@ namespace OpenSim.Region.ScriptEngine.Common
// the object we are in
UUID objectID = m_host.ParentUUID;
if(objectID == UUID.Zero) return;
if (objectID == UUID.Zero) return;
// we need the permission first, to know which avatar we want to clear the camera for
UUID agentID = m_host.TaskInventory[invItemID].PermsGranter;

4
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -7418,7 +7418,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// the object we are in
UUID objectID = m_host.ParentUUID;
if(objectID == UUID.Zero) return;
if (objectID == UUID.Zero) return;
// we need the permission first, to know which avatar we want to set the camera for
UUID agentID = m_host.TaskInventory[invItemID].PermsGranter;
@@ -7469,7 +7469,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// the object we are in
UUID objectID = m_host.ParentUUID;
if(objectID == UUID.Zero) return;
if (objectID == UUID.Zero) return;
// we need the permission first, to know which avatar we want to clear the camera for
UUID agentID = m_host.TaskInventory[invItemID].PermsGranter;

2
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@@ -686,7 +686,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
{
// If we're currently in an event, just tell it to save upon return
//
if(m_InEvent)
if (m_InEvent)
{
m_SaveState = true;
return;

22
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@@ -216,13 +216,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if (sleepTime > 0)
{
m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance),
m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance),
new Object[]{ sleepTime });
}
if (saveTime > 0)
{
m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoBackup),
m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoBackup),
new Object[] { saveTime });
}
@@ -278,7 +278,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
instances.Clear();
if (saveTime > 0)
m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoBackup),
m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoBackup),
new Object[] { saveTime });
return 0;
@@ -301,7 +301,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
System.Threading.Thread.Sleep(sleepTime);
m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance),
m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance),
new Object[]{ sleepTime });
return 0;
@@ -331,13 +331,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{
m_firstStart = false;
m_CurrentCompile = m_ThreadPool.QueueWorkItem(
new WorkItemCallback(this.DoScriptWait),
new WorkItemCallback(this.DoScriptWait),
new Object[0]);
return;
}
m_CurrentCompile = m_ThreadPool.QueueWorkItem(
new WorkItemCallback(this.DoOnRezScriptQueue),
new WorkItemCallback(this.DoOnRezScriptQueue),
new Object[0]);
}
}
@@ -352,7 +352,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if (m_CompileQueue.Count > 0)
{
m_CurrentCompile = m_ThreadPool.QueueWorkItem(
new WorkItemCallback(this.DoOnRezScriptQueue),
new WorkItemCallback(this.DoOnRezScriptQueue),
new Object[0]);
}
else
@@ -383,7 +383,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if (m_CompileQueue.Count > 0)
{
m_CurrentCompile = m_ThreadPool.QueueWorkItem(
new WorkItemCallback(this.DoOnRezScriptQueue),
new WorkItemCallback(this.DoOnRezScriptQueue),
new Object[0]);
}
else
@@ -493,7 +493,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
}
m_DomainScripts[appDomain].Add(itemID);
ScriptInstance instance =
ScriptInstance instance =
new ScriptInstance(this,localID,
part.UUID, itemID, assetID, assembly,
m_AppDomains[appDomain],
@@ -657,7 +657,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
public IScriptWorkItem QueueEventHandler(object parms)
{
return new XWorkItem(m_ThreadPool.QueueWorkItem(
new WorkItemCallback(this.ProcessEventHandler),
new WorkItemCallback(this.ProcessEventHandler),
parms));
}
@@ -723,7 +723,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
string[] pathList = new string[] {"bin", "ScriptEngines",
Path.Combine("ScriptEngines",
m_Scene.RegionInfo.RegionID.ToString())};
string assemblyName = args.Name;
if (assemblyName.IndexOf(",") != -1)
assemblyName = args.Name.Substring(0, args.Name.IndexOf(","));