Merge branch 'master' into careminster

2026-08-01 22:26:09 +08:00 · 2013-07-04 22:32:58 +01:00
parent ffcee82b1d d80936bbbb
commit 5ddcc25ee9
31 changed files with 398 additions and 190 deletions
--- a/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Data.MSSQL
        {
        }

-        public GridUserData Get(string userID)
+        public new GridUserData Get(string userID)
        {
            GridUserData[] ret = Get("UserID", userID);

@@ -60,5 +60,10 @@ namespace OpenSim.Data.MSSQL
            return ret[0];
        }

+        public GridUserData[] GetAll(string userID)
+        {
+            return base.Get(String.Format("UserID LIKE '{0}%'", userID));
+        }
+
    }
 }