diff options
| author | Justin Clark-Casey (justincc) | 2013-09-02 17:27:45 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-09-04 00:46:26 +0100 |
| commit | 8b7bcc8346f5f2a163278c5f5a15613c9b44a551 (patch) | |
| tree | e57f88a7f7fd2021097f1fbc93e8e620cace92fe /OpenSim/Framework | |
| parent | Fix exception thrown after a region has been restarted through scheduling. (diff) | |
| download | opensim-SC_OLD-8b7bcc8346f5f2a163278c5f5a15613c9b44a551.zip opensim-SC_OLD-8b7bcc8346f5f2a163278c5f5a15613c9b44a551.tar.gz opensim-SC_OLD-8b7bcc8346f5f2a163278c5f5a15613c9b44a551.tar.bz2 opensim-SC_OLD-8b7bcc8346f5f2a163278c5f5a15613c9b44a551.tar.xz | |
Allow one to specify a DefaultHGRegion flag in [GridService] in order to allow different default regions for HG and direct grid logins.
This requires a new GridService.GetDefaultHypergridRegions() so ROBUST services require updating but not simulators.
This method still returns regions flagged with just DefaultRegion after any DefaultHGRegions, so if no DefaultHGRegions are specified
then existing configured defaults will still work.
Immediate use is for conference where we need to be able to specify different defaults
However, this is also generally useful to send experienced HG users to one default location and local users whose specified region fails (e.g. no "home" or "last") to another.
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/RegionFlags.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionFlags.cs b/OpenSim/Framework/RegionFlags.cs index a3089b0..7c6569e 100644 --- a/OpenSim/Framework/RegionFlags.cs +++ b/OpenSim/Framework/RegionFlags.cs | |||
| @@ -48,6 +48,7 @@ namespace OpenSim.Framework | |||
| 48 | NoMove = 64, // Don't allow moving this region | 48 | NoMove = 64, // Don't allow moving this region |
| 49 | Reservation = 128, // This is an inactive reservation | 49 | Reservation = 128, // This is an inactive reservation |
| 50 | Authenticate = 256, // Require authentication | 50 | Authenticate = 256, // Require authentication |
| 51 | Hyperlink = 512 // Record represents a HG link | 51 | Hyperlink = 512, // Record represents a HG link |
| 52 | DefaultHGRegion = 1024 // Record represents a default region for hypergrid teleports only. | ||
| 52 | } | 53 | } |
| 53 | } \ No newline at end of file | 54 | } \ No newline at end of file |