diff options
author | Melanie | 2010-03-15 17:23:35 +0000 |
---|---|---|
committer | Melanie | 2010-03-15 17:23:35 +0000 |
commit | d3f33acc1a6a385ee19814286fe27cb5e48c1551 (patch) | |
tree | 07795e74a637ca63d96b5ee06950b8c1a7a99489 /OpenSim/Tests/Common/Mock/TestScene.cs | |
parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
parent | flip UVs for profile faces (diff) | |
download | opensim-SC-d3f33acc1a6a385ee19814286fe27cb5e48c1551.zip opensim-SC-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.gz opensim-SC-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.bz2 opensim-SC-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Tests/Common/Mock/TestScene.cs')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs index 076cb7a..01f2c14 100644 --- a/OpenSim/Tests/Common/Mock/TestScene.cs +++ b/OpenSim/Tests/Common/Mock/TestScene.cs | |||
@@ -65,6 +65,6 @@ namespace OpenSim.Tests.Common.Mock | |||
65 | public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter | 65 | public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter |
66 | { | 66 | { |
67 | get { return m_asyncSceneObjectDeleter; } | 67 | get { return m_asyncSceneObjectDeleter; } |
68 | } | 68 | } |
69 | } | 69 | } |
70 | } | 70 | } \ No newline at end of file |