diff options
author | Justin Clark-Casey (justincc) | 2012-10-09 01:35:27 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-10-09 01:35:27 +0100 |
commit | 73c9abf5f2e2017bf924d6183502e337d28a7232 (patch) | |
tree | 07fd1ab2e9aef88412f37d8023bb7a903bb79047 /OpenSim/Services/Connectors | |
parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
download | opensim-SC_OLD-73c9abf5f2e2017bf924d6183502e337d28a7232.zip opensim-SC_OLD-73c9abf5f2e2017bf924d6183502e337d28a7232.tar.gz opensim-SC_OLD-73c9abf5f2e2017bf924d6183502e337d28a7232.tar.bz2 opensim-SC_OLD-73c9abf5f2e2017bf924d6183502e337d28a7232.tar.xz |
Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs index 35cb408..038a4bf 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | |||
@@ -384,8 +384,8 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
384 | if (response["Success"].AsBoolean()) | 384 | if (response["Success"].AsBoolean()) |
385 | { | 385 | { |
386 | OSDMap extraData = response["ExtraData"] as OSDMap; | 386 | OSDMap extraData = response["ExtraData"] as OSDMap; |
387 | int enabled = response["Enabled"].AsBoolean() ? (int) OpenSim.Data.RegionFlags.RegionOnline : 0; | 387 | int enabled = response["Enabled"].AsBoolean() ? (int)OpenSim.Framework.RegionFlags.RegionOnline : 0; |
388 | int hypergrid = extraData["HyperGrid"].AsBoolean() ? (int) OpenSim.Data.RegionFlags.Hyperlink : 0; | 388 | int hypergrid = extraData["HyperGrid"].AsBoolean() ? (int)OpenSim.Framework.RegionFlags.Hyperlink : 0; |
389 | int flags = enabled | hypergrid; | 389 | int flags = enabled | hypergrid; |
390 | m_log.DebugFormat("[SGGC] enabled - {0} hg - {1} flags - {2}", enabled, hypergrid, flags); | 390 | m_log.DebugFormat("[SGGC] enabled - {0} hg - {1} flags - {2}", enabled, hypergrid, flags); |
391 | return flags; | 391 | return flags; |