ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 03:15:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2013-07-04 22:32:58 +01:00
parent ffcee82b1d d80936bbbb
commit 5ddcc25ee9
31 changed files with 398 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Data/MySQL/MySQLGridUserData.cs
View File

@@ -46,7 +46,7 @@ namespace OpenSim.Data.MySQL
public MySQLGridUserData(string connectionString, string realm) : base(connectionString, realm, "GridUserStore") {}
public GridUserData Get(string userID)
public new GridUserData Get(string userID)
{
GridUserData[] ret = Get("UserID", userID);
@@ -56,6 +56,9 @@ namespace OpenSim.Data.MySQL
return ret[0];
}
public GridUserData[] GetAll(string userID)
{
return base.Get(String.Format("UserID LIKE '{0}%'", userID));
}
}
}

2
OpenSim/Data/MySQL/Resources/FriendsStore.migrations
View File

@@ -9,7 +9,7 @@ CREATE TABLE `Friends` (
`Offered` VARCHAR(32) NOT NULL DEFAULT 0,
PRIMARY KEY(`PrincipalID`, `Friend`),
KEY(`PrincipalID`)
);
) ENGINE=InnoDB;
COMMIT;