diff options
| author | UbitUmarov | 2015-09-03 18:39:08 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-03 18:39:08 +0100 |
| commit | cdaed113872f0615a0d2864cc54064a4432054c6 (patch) | |
| tree | 246e62dfeffac632cdcd9738a77faebd30b3bd6c /OpenSim/Data/MySQL/Resources/UserProfiles.migrations | |
| parent | seems to compile ( tests comented out) (diff) | |
| download | opensim-SC_OLD-cdaed113872f0615a0d2864cc54064a4432054c6.zip opensim-SC_OLD-cdaed113872f0615a0d2864cc54064a4432054c6.tar.gz opensim-SC_OLD-cdaed113872f0615a0d2864cc54064a4432054c6.tar.bz2 opensim-SC_OLD-cdaed113872f0615a0d2864cc54064a4432054c6.tar.xz | |
at last we can login and see objects ( friends is dead and disable in
scenepresence)
Diffstat (limited to 'OpenSim/Data/MySQL/Resources/UserProfiles.migrations')
| -rw-r--r-- | OpenSim/Data/MySQL/Resources/UserProfiles.migrations | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations index 3df9b9b..87e99fa 100644 --- a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations +++ b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations | |||
| @@ -81,7 +81,6 @@ CREATE TABLE IF NOT EXISTS `userdata` ( | |||
| 81 | 81 | ||
| 82 | commit; | 82 | commit; |
| 83 | 83 | ||
| 84 | <<<<<<< HEAD | ||
| 85 | :VERSION 3 # ------------------------------- | 84 | :VERSION 3 # ------------------------------- |
| 86 | begin; | 85 | begin; |
| 87 | CREATE TABLE IF NOT EXISTS `usersettings` ( | 86 | CREATE TABLE IF NOT EXISTS `usersettings` ( |
| @@ -97,5 +96,3 @@ commit; | |||
| 97 | begin; | 96 | begin; |
| 98 | ALTER TABLE userpicks ADD COLUMN gatekeeper varchar(255); | 97 | ALTER TABLE userpicks ADD COLUMN gatekeeper varchar(255); |
| 99 | commit; | 98 | commit; |
| 100 | ======= | ||
| 101 | >>>>>>> avn/ubitvar | ||