diff options
| author | Diva Canto | 2009-08-15 15:08:04 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-08-15 15:08:04 -0700 |
| commit | 710a15845c0a5bb42006ad1fef7f95b330808f1e (patch) | |
| tree | 3501009f4937c21242600cf776afe6331367a078 /OpenSim/Region/Framework | |
| parent | Merge branch 'master' of ../opensim-diva/ into inventory-connector (diff) | |
| parent | Changed one word in a comment (diff) | |
| download | opensim-SC-710a15845c0a5bb42006ad1fef7f95b330808f1e.zip opensim-SC-710a15845c0a5bb42006ad1fef7f95b330808f1e.tar.gz opensim-SC-710a15845c0a5bb42006ad1fef7f95b330808f1e.tar.bz2 opensim-SC-710a15845c0a5bb42006ad1fef7f95b330808f1e.tar.xz | |
Merge branch 'master' into inventory-connector
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 7b6b666..7a45e3b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -585,7 +585,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 585 | group.SetAttachmentPoint(Convert.ToByte(AttachmentPt)); | 585 | group.SetAttachmentPoint(Convert.ToByte(AttachmentPt)); |
| 586 | group.AbsolutePosition = attachPos; | 586 | group.AbsolutePosition = attachPos; |
| 587 | 587 | ||
| 588 | // Saves and gets assetID | 588 | // Saves and gets itemID |
| 589 | UUID itemId; | 589 | UUID itemId; |
| 590 | 590 | ||
| 591 | if (group.GetFromItemID() == UUID.Zero) | 591 | if (group.GetFromItemID() == UUID.Zero) |