diff options
| author | Melanie | 2011-12-10 00:40:41 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-10 00:40:41 +0000 |
| commit | 3f421837979a1d3d830274c967abc7258cb50687 (patch) | |
| tree | 3ae57deca915d7dc89586d103d48c6f6f6fd1d6d /OpenSim/Region/Framework/Scenes/SceneBase.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: remove a mono compiler warning (diff) | |
| download | opensim-SC_OLD-3f421837979a1d3d830274c967abc7258cb50687.zip opensim-SC_OLD-3f421837979a1d3d830274c967abc7258cb50687.tar.gz opensim-SC_OLD-3f421837979a1d3d830274c967abc7258cb50687.tar.bz2 opensim-SC_OLD-3f421837979a1d3d830274c967abc7258cb50687.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneBase.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 84da700..da3b4dd 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
| @@ -213,11 +213,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 213 | } | 213 | } |
| 214 | 214 | ||
| 215 | #region admin stuff | 215 | #region admin stuff |
| 216 | |||
| 217 | public virtual bool PresenceChildStatus(UUID avatarID) | ||
| 218 | { | ||
| 219 | return false; | ||
| 220 | } | ||
| 221 | 216 | ||
| 222 | public abstract void OtherRegionUp(GridRegion otherRegion); | 217 | public abstract void OtherRegionUp(GridRegion otherRegion); |
| 223 | 218 | ||