diff options
| author | Melanie | 2012-10-31 21:42:06 +0000 |
|---|---|---|
| committer | Melanie | 2012-10-31 21:42:06 +0000 |
| commit | a2c60943240ad9af8fe2bd86d990f36fc26930ee (patch) | |
| tree | 15585e94e32082d7ac74bb341d82ce6bcccb8a57 /OpenSim/Region/CoreModules/Avatar | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Also add the additional ScriptException constructor necessary to get [Seriali... (diff) | |
| download | opensim-SC-a2c60943240ad9af8fe2bd86d990f36fc26930ee.zip opensim-SC-a2c60943240ad9af8fe2bd86d990f36fc26930ee.tar.gz opensim-SC-a2c60943240ad9af8fe2bd86d990f36fc26930ee.tar.bz2 opensim-SC-a2c60943240ad9af8fe2bd86d990f36fc26930ee.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/TaskInventoryItem.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to '')
| -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 e711afb..acd156e 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -639,9 +639,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 639 | 639 | ||
| 640 | if (grp.HasGroupChanged) | 640 | if (grp.HasGroupChanged) |
| 641 | { | 641 | { |
| 642 | // m_log.DebugFormat( | 642 | m_log.DebugFormat( |
| 643 | // "[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}", | 643 | "[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}", |
| 644 | // grp.UUID, grp.AttachmentPoint); | 644 | grp.UUID, grp.AttachmentPoint); |
| 645 | 645 | ||
| 646 | string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp, scriptedState); | 646 | string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp, scriptedState); |
| 647 | 647 | ||