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/Tests/Common/Mock/TestScene.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/Tests/Common/Mock/TestScene.cs')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestScene.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs index 45acf91..e559871 100644 --- a/OpenSim/Tests/Common/Mock/TestScene.cs +++ b/OpenSim/Tests/Common/Mock/TestScene.cs | |||
| @@ -34,7 +34,10 @@ using OpenSim.Region.Framework; | |||
| 34 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
| 35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
| 36 | using OpenSim.Region.Physics.Manager; | 36 | using OpenSim.Region.Physics.Manager; |
| 37 | <<<<<<< HEAD | ||
| 37 | using OpenSim.Services.Interfaces; | 38 | using OpenSim.Services.Interfaces; |
| 39 | ======= | ||
| 40 | >>>>>>> avn/ubitvar | ||
| 38 | 41 | ||
| 39 | namespace OpenSim.Tests.Common | 42 | namespace OpenSim.Tests.Common |
| 40 | { | 43 | { |