aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMelanie2011-10-11 21:32:24 +0100
committerMelanie2011-10-11 21:32:24 +0100
commitf1fa059b37f599f7bf785c5c6e0cb7d0fb7bfbe4 (patch)
treebd2510e8723ab1749cf8c04159e9d5c3f3094165 /OpenSim/Region/Application
parentMerge commit '923f2459cfa8106c6de52dc694c700ab07d8109b' into bigmerge (diff)
parentFix build errors on Windows by adding missing OpenSim.Services.Base reference (diff)
downloadopensim-SC_OLD-f1fa059b37f599f7bf785c5c6e0cb7d0fb7bfbe4.zip
opensim-SC_OLD-f1fa059b37f599f7bf785c5c6e0cb7d0fb7bfbe4.tar.gz
opensim-SC_OLD-f1fa059b37f599f7bf785c5c6e0cb7d0fb7bfbe4.tar.bz2
opensim-SC_OLD-f1fa059b37f599f7bf785c5c6e0cb7d0fb7bfbe4.tar.xz
Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 8d38bb8..77f38ed 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -46,7 +46,8 @@ using OpenSim.Region.Framework;
46using OpenSim.Region.Framework.Interfaces; 46using OpenSim.Region.Framework.Interfaces;
47using OpenSim.Region.Framework.Scenes; 47using OpenSim.Region.Framework.Scenes;
48using OpenSim.Region.Physics.Manager; 48using OpenSim.Region.Physics.Manager;
49using OpenSim.Server.Base; 49using OpenSim.Server.Base;
50using OpenSim.Services.Base;
50using OpenSim.Services.Interfaces; 51using OpenSim.Services.Interfaces;
51using OpenSim.Services.UserAccountService; 52using OpenSim.Services.UserAccountService;
52 53