diff options
| author | Melanie | 2011-11-02 11:49:25 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-02 11:49:25 +0000 |
| commit | c55e161dc41638332a92f9524e2366741326b9a5 (patch) | |
| tree | e49e4c7ffd06d7d7c1ef5febe14e5b3779e90952 /OpenSim/Region/Framework | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Streamline PRIM_LINK_TARGET, eliminating a recursion and a failure scenario (diff) | |
| download | opensim-SC_OLD-c55e161dc41638332a92f9524e2366741326b9a5.zip opensim-SC_OLD-c55e161dc41638332a92f9524e2366741326b9a5.tar.gz opensim-SC_OLD-c55e161dc41638332a92f9524e2366741326b9a5.tar.bz2 opensim-SC_OLD-c55e161dc41638332a92f9524e2366741326b9a5.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c162519..cd5ac6c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -489,11 +489,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 489 | get { return m_authenticateHandler; } | 489 | get { return m_authenticateHandler; } |
| 490 | } | 490 | } |
| 491 | 491 | ||
| 492 | public SceneGraph SceneContents | ||
| 493 | { | ||
| 494 | get { return m_sceneGraph; } | ||
| 495 | } | ||
| 496 | |||
| 497 | public bool UseBackup | 492 | public bool UseBackup |
| 498 | { | 493 | { |
| 499 | get { return m_useBackup; } | 494 | get { return m_useBackup; } |