diff options
| author | Melanie | 2012-04-23 20:44:41 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-23 20:44:41 +0100 |
| commit | e9037098475202c02d3327d2dff877d0fd108c93 (patch) | |
| tree | cd52623e1f12ffe0ca98609f270d27d30afc35af /OpenSim/Region/CoreModules/World | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Mantis 5977 Corrections to llRegionSayTo (diff) | |
| download | opensim-SC_OLD-e9037098475202c02d3327d2dff877d0fd108c93.zip opensim-SC_OLD-e9037098475202c02d3327d2dff877d0fd108c93.tar.gz opensim-SC_OLD-e9037098475202c02d3327d2dff877d0fd108c93.tar.bz2 opensim-SC_OLD-e9037098475202c02d3327d2dff877d0fd108c93.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index 63f1363..e05e8f6 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
| @@ -102,9 +102,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
| 102 | PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere(); | 102 | PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere(); |
| 103 | Vector3 groupPosition = new Vector3(10, 20, 30); | 103 | Vector3 groupPosition = new Vector3(10, 20, 30); |
| 104 | Quaternion rotationOffset = new Quaternion(20, 30, 40, 50); | 104 | Quaternion rotationOffset = new Quaternion(20, 30, 40, 50); |
| 105 | Vector3 offsetPosition = new Vector3(5, 10, 15); | 105 | // Vector3 offsetPosition = new Vector3(5, 10, 15); |
| 106 | 106 | ||
| 107 | return new SceneObjectPart(ownerId, shape, groupPosition, rotationOffset, offsetPosition) { Name = partName }; | 107 | return new SceneObjectPart(ownerId, shape, groupPosition, rotationOffset, Vector3.Zero) { Name = partName }; |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | protected SceneObjectPart CreateSceneObjectPart2() | 110 | protected SceneObjectPart CreateSceneObjectPart2() |