diff options
| author | Jeff Ames | 2008-09-09 01:26:48 +0000 |
|---|---|---|
| committer | Jeff Ames | 2008-09-09 01:26:48 +0000 |
| commit | fae34bb10cfa10702faf5c19d8c8517faa018cb5 (patch) | |
| tree | 2001f24703b010957254dbb49ef5e222ff30b84d /OpenSim/Region/ScriptEngine/Shared | |
| parent | Fix state xxx within state xxx itself triggering a state "change" to (diff) | |
| download | opensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.zip opensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.gz opensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.bz2 opensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.xz | |
Update svn properties, formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index ae775f7..4b70ec8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -7418,7 +7418,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 7418 | 7418 | ||
| 7419 | // the object we are in | 7419 | // the object we are in |
| 7420 | UUID objectID = m_host.ParentUUID; | 7420 | UUID objectID = m_host.ParentUUID; |
| 7421 | if(objectID == UUID.Zero) return; | 7421 | if (objectID == UUID.Zero) return; |
| 7422 | 7422 | ||
| 7423 | // we need the permission first, to know which avatar we want to set the camera for | 7423 | // we need the permission first, to know which avatar we want to set the camera for |
| 7424 | UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; | 7424 | UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; |
| @@ -7469,7 +7469,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 7469 | 7469 | ||
| 7470 | // the object we are in | 7470 | // the object we are in |
| 7471 | UUID objectID = m_host.ParentUUID; | 7471 | UUID objectID = m_host.ParentUUID; |
| 7472 | if(objectID == UUID.Zero) return; | 7472 | if (objectID == UUID.Zero) return; |
| 7473 | 7473 | ||
| 7474 | // we need the permission first, to know which avatar we want to clear the camera for | 7474 | // we need the permission first, to know which avatar we want to clear the camera for |
| 7475 | UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; | 7475 | UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 97c79b5..1ee6f77 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -686,7 +686,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 686 | { | 686 | { |
| 687 | // If we're currently in an event, just tell it to save upon return | 687 | // If we're currently in an event, just tell it to save upon return |
| 688 | // | 688 | // |
| 689 | if(m_InEvent) | 689 | if (m_InEvent) |
| 690 | { | 690 | { |
| 691 | m_SaveState = true; | 691 | m_SaveState = true; |
| 692 | return; | 692 | return; |