diff options
| author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
| commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
| tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Data/MySQL/Resources/FriendsStore.migrations | |
| parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/MySQL/Resources/FriendsStore.migrations | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations index 55d82ec..5faf956 100644 --- a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations +++ b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations | |||
| @@ -9,7 +9,7 @@ CREATE TABLE `Friends` ( | |||
| 9 | `Offered` VARCHAR(32) NOT NULL DEFAULT 0, | 9 | `Offered` VARCHAR(32) NOT NULL DEFAULT 0, |
| 10 | PRIMARY KEY(`PrincipalID`, `Friend`), | 10 | PRIMARY KEY(`PrincipalID`, `Friend`), |
| 11 | KEY(`PrincipalID`) | 11 | KEY(`PrincipalID`) |
| 12 | ); | 12 | ) ENGINE=InnoDB; |
| 13 | 13 | ||
| 14 | COMMIT; | 14 | COMMIT; |
| 15 | 15 | ||