aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-10-09 17:20:01 +0100
committerJustin Clark-Casey (justincc)2012-10-09 17:20:01 +0100
commit40bf789ad718eb345d79d4aed9d5ee8140cbd9e0 (patch)
tree0df08b7abba98974cc1f49194ac16ac4f82ebd75
parentminor: Add documentation to IGridService.GetRegionFlags() (diff)
downloadopensim-SC_OLD-40bf789ad718eb345d79d4aed9d5ee8140cbd9e0.zip
opensim-SC_OLD-40bf789ad718eb345d79d4aed9d5ee8140cbd9e0.tar.gz
opensim-SC_OLD-40bf789ad718eb345d79d4aed9d5ee8140cbd9e0.tar.bz2
opensim-SC_OLD-40bf789ad718eb345d79d4aed9d5ee8140cbd9e0.tar.xz
Disambiguate use of RegionFlags in NullRegionData
This was not necessary with the nant build but is for xbuild, since xbuild includes associated project DLLs And so picks up OpenMetaverse.dll even though it isn't referenced by OpenSim.Data.Null.dll
-rw-r--r--OpenSim/Data/Null/NullRegionData.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs
index deb50cb..b4d701a 100644
--- a/OpenSim/Data/Null/NullRegionData.cs
+++ b/OpenSim/Data/Null/NullRegionData.cs
@@ -33,6 +33,7 @@ using OpenSim.Framework;
33using OpenSim.Data; 33using OpenSim.Data;
34using System.Reflection; 34using System.Reflection;
35using log4net; 35using log4net;
36using RegionFlags = OpenSim.Framework.RegionFlags;
36 37
37namespace OpenSim.Data.Null 38namespace OpenSim.Data.Null
38{ 39{