diff options
| author | Justin Clark-Casey (justincc) | 2012-10-31 00:31:18 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-10-31 00:31:18 +0000 |
| commit | 6235d16c3148bb6f9f881b0dc286deccfdf9148a (patch) | |
| tree | 1d8d9e0b5bdf5872dbf6ff19f87c99593d3e2505 /OpenSim/Region/CoreModules/Avatar | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-6235d16c3148bb6f9f881b0dc286deccfdf9148a.zip opensim-SC_OLD-6235d16c3148bb6f9f881b0dc286deccfdf9148a.tar.gz opensim-SC_OLD-6235d16c3148bb6f9f881b0dc286deccfdf9148a.tar.bz2 opensim-SC_OLD-6235d16c3148bb6f9f881b0dc286deccfdf9148a.tar.xz | |
Make "show object part" command correctly display script status.
Uses new IEntityInventory.TryGetScriptInstanceRunning()
Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 2a513e9..24170fc 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -571,9 +571,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 571 | 571 | ||
| 572 | if (grp.HasGroupChanged) | 572 | if (grp.HasGroupChanged) |
| 573 | { | 573 | { |
| 574 | // m_log.DebugFormat( | 574 | m_log.DebugFormat( |
| 575 | // "[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}", | 575 | "[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}", |
| 576 | // grp.UUID, grp.AttachmentPoint); | 576 | grp.UUID, grp.AttachmentPoint); |
| 577 | 577 | ||
| 578 | string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp, scriptedState); | 578 | string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp, scriptedState); |
| 579 | 579 | ||