diff options
| author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
| commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
| tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs index 8ec6974..3caea8b 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs | |||
| @@ -96,7 +96,7 @@ namespace OpenSim.Region.Framework.Tests | |||
| 96 | Quaternion rezRot = new Quaternion(0.5f, 0.5f, 0.5f, 0.5f); | 96 | Quaternion rezRot = new Quaternion(0.5f, 0.5f, 0.5f, 0.5f); |
| 97 | Vector3 rezVel = new Vector3(2, 2, 2); | 97 | Vector3 rezVel = new Vector3(2, 2, 2); |
| 98 | 98 | ||
| 99 | scene.RezObject(sop1, taskSceneObjectItem, rezPos, rezRot, rezVel, 0); | 99 | scene.RezObject(sop1, taskSceneObjectItem, rezPos, rezRot, rezVel, 0,false); |
| 100 | 100 | ||
| 101 | SceneObjectGroup rezzedObject = scene.GetSceneObjectGroup("tso"); | 101 | SceneObjectGroup rezzedObject = scene.GetSceneObjectGroup("tso"); |
| 102 | 102 | ||