diff options
| author | Diva Canto | 2011-12-21 15:17:44 -0800 |
|---|---|---|
| committer | Diva Canto | 2011-12-21 15:17:44 -0800 |
| commit | bb0c6a498bfbd5fe42b287e5b79b15a887b88600 (patch) | |
| tree | cc97171a5264a64dad3ece91e0f090ea4cf45d9d /OpenSim/Region/Application | |
| parent | Moved an external test into the method that uses those preconditions. (diff) | |
| parent | Remove unused SetAcceleration and add set on Acceleration parameter (diff) | |
| download | opensim-SC_OLD-bb0c6a498bfbd5fe42b287e5b79b15a887b88600.zip opensim-SC_OLD-bb0c6a498bfbd5fe42b287e5b79b15a887b88600.tar.gz opensim-SC_OLD-bb0c6a498bfbd5fe42b287e5b79b15a887b88600.tar.bz2 opensim-SC_OLD-bb0c6a498bfbd5fe42b287e5b79b15a887b88600.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 55ba18a..9f9b4f0 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; |