diff options
| author | Diva Canto | 2010-01-15 15:13:11 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-01-15 15:13:11 -0800 |
| commit | 8d5a5d6a4dd3aa33fc7ba7555c86b34ac5f6db8f (patch) | |
| tree | 2711c442fff9214cc6c8b9488e06781ec241b908 /OpenSim/Data | |
| parent | * General cleanup of Teleports, Crossings and Child agents. They are now in t... (diff) | |
| parent | Implement region registration with authentication (diff) | |
| download | opensim-SC_OLD-8d5a5d6a4dd3aa33fc7ba7555c86b34ac5f6db8f.zip opensim-SC_OLD-8d5a5d6a4dd3aa33fc7ba7555c86b34ac5f6db8f.tar.gz opensim-SC_OLD-8d5a5d6a4dd3aa33fc7ba7555c86b34ac5f6db8f.tar.bz2 opensim-SC_OLD-8d5a5d6a4dd3aa33fc7ba7555c86b34ac5f6db8f.tar.xz | |
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/IRegionData.cs | 5 | ||||
| -rw-r--r-- | OpenSim/Data/MySQL/Resources/007_GridStore.sql | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Data/IRegionData.cs b/OpenSim/Data/IRegionData.cs index 140bc96..9ed5dd0 100644 --- a/OpenSim/Data/IRegionData.cs +++ b/OpenSim/Data/IRegionData.cs | |||
| @@ -72,6 +72,9 @@ namespace OpenSim.Data | |||
| 72 | RegionOnline = 4, // Set when a region comes online, unset when it unregisters and DeleteOnUnregister is false | 72 | RegionOnline = 4, // Set when a region comes online, unset when it unregisters and DeleteOnUnregister is false |
| 73 | NoDirectLogin = 8, // Region unavailable for direct logins (by name) | 73 | NoDirectLogin = 8, // Region unavailable for direct logins (by name) |
| 74 | Persistent = 16, // Don't remove on unregister | 74 | Persistent = 16, // Don't remove on unregister |
| 75 | LockedOut = 32 // Don't allow registration | 75 | LockedOut = 32, // Don't allow registration |
| 76 | NoMove = 64, // Don't allow moving this region | ||
| 77 | Reservation = 128, // This is an inactive reservation | ||
| 78 | Authenticate = 256 // Require authentication | ||
| 76 | } | 79 | } |
| 77 | } | 80 | } |
diff --git a/OpenSim/Data/MySQL/Resources/007_GridStore.sql b/OpenSim/Data/MySQL/Resources/007_GridStore.sql new file mode 100644 index 0000000..3f88d3d --- /dev/null +++ b/OpenSim/Data/MySQL/Resources/007_GridStore.sql | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | BEGIN; | ||
| 2 | |||
| 3 | ALTER TABLE `regions` ADD COLUMN `PrincipalID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'; | ||
| 4 | |||
| 5 | COMMIT; | ||
| 6 | |||