diff options
| author | Justin Clark-Casey (justincc) | 2011-09-16 21:06:09 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-09-16 21:06:09 +0100 |
| commit | c695e23dd9474e31b031e4d1f57b23aba386145a (patch) | |
| tree | d3d02b06ff9835cebcffc635d070b7fb94ebd467 /OpenSim | |
| parent | Updated some variables to be closer to the coding standards (and easier to un... (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-c695e23dd9474e31b031e4d1f57b23aba386145a.zip opensim-SC_OLD-c695e23dd9474e31b031e4d1f57b23aba386145a.tar.gz opensim-SC_OLD-c695e23dd9474e31b031e4d1f57b23aba386145a.tar.bz2 opensim-SC_OLD-c695e23dd9474e31b031e4d1f57b23aba386145a.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 54caac4..866ba9a 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -46,7 +46,8 @@ 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.Interfaces; | 51 | using OpenSim.Services.Interfaces; |
| 51 | using OpenSim.Services.UserAccountService; | 52 | using OpenSim.Services.UserAccountService; |
| 52 | 53 | ||