diff options
| author | Melanie | 2011-12-22 16:37:25 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-22 16:37:25 +0000 |
| commit | b970d4f976ec7f264c33948c734a15a2dbf0ac7d (patch) | |
| tree | 93a3365e4a8a32bdfce1ef92bafc02f79f98d449 /OpenSim/Region/Application | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fixing a bug introduced yesterday. This put the precondition test inside Chec... (diff) | |
| download | opensim-SC_OLD-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.zip opensim-SC_OLD-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.tar.gz opensim-SC_OLD-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.tar.bz2 opensim-SC_OLD-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 50baa56..9fdba92 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -46,7 +46,7 @@ using OpenSim.Region.Framework; | |||
| 46 | using OpenSim.Region.Framework.Interfaces; | 46 | using OpenSim.Region.Framework.Interfaces; |
| 47 | using OpenSim.Region.Framework.Scenes; | 47 | using OpenSim.Region.Framework.Scenes; |
| 48 | using OpenSim.Region.Physics.Manager; | 48 | using OpenSim.Region.Physics.Manager; |
| 49 | using OpenSim.Server.Base; | 49 | using OpenSim.Server.Base; |
| 50 | using OpenSim.Services.Base; | 50 | using OpenSim.Services.Base; |
| 51 | using OpenSim.Services.Interfaces; | 51 | using OpenSim.Services.Interfaces; |
| 52 | using OpenSim.Services.UserAccountService; | 52 | using OpenSim.Services.UserAccountService; |