Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge

author: Melanie 2011-10-11 21:32:24 +0100
committer: Melanie 2011-10-11 21:32:24 +0100
commit: f1fa059b37f599f7bf785c5c6e0cb7d0fb7bfbe4 (patch)
tree: bd2510e8723ab1749cf8c04159e9d5c3f3094165 /OpenSim/Region/Application
parent: Merge commit '923f2459cfa8106c6de52dc694c700ab07d8109b' into bigmerge (diff)
parent: Fix build errors on Windows by adding missing OpenSim.Services.Base reference (diff)
download: opensim-SC_OLD-f1fa059b37f599f7bf785c5c6e0cb7d0fb7bfbe4.zip
opensim-SC_OLD-f1fa059b37f599f7bf785c5c6e0cb7d0fb7bfbe4.tar.gz
opensim-SC_OLD-f1fa059b37f599f7bf785c5c6e0cb7d0fb7bfbe4.tar.bz2
opensim-SC_OLD-f1fa059b37f599f7bf785c5c6e0cb7d0fb7bfbe4.tar.xz
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;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
-using OpenSim.Server.Base;
+using OpenSim.Server.Base;
+using OpenSim.Services.Base;
 using OpenSim.Services.Interfaces;
 using OpenSim.Services.UserAccountService;
author	Melanie	2011-10-11 21:32:24 +0100
committer	Melanie	2011-10-11 21:32:24 +0100
commit	f1fa059b37f599f7bf785c5c6e0cb7d0fb7bfbe4 (patch)
tree	bd2510e8723ab1749cf8c04159e9d5c3f3094165 /OpenSim/Region/Application
parent	Merge commit '923f2459cfa8106c6de52dc694c700ab07d8109b' into bigmerge (diff)
parent	Fix build errors on Windows by adding missing OpenSim.Services.Base reference (diff)
download	opensim-SC_OLD-f1fa059b37f599f7bf785c5c6e0cb7d0fb7bfbe4.zip opensim-SC_OLD-f1fa059b37f599f7bf785c5c6e0cb7d0fb7bfbe4.tar.gz opensim-SC_OLD-f1fa059b37f599f7bf785c5c6e0cb7d0fb7bfbe4.tar.bz2 opensim-SC_OLD-f1fa059b37f599f7bf785c5c6e0cb7d0fb7bfbe4.tar.xz

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;
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