Merge branch 'master' into careminster-presence-refactor

1 files changed, 7 insertions, 2 deletions

diff --git a/OpenSim/Data/IGridUserData.cs b/OpenSim/Data/IGridUserData.cs
index bd7a435..e15a1f8 100644
--- a/OpenSim/Data/IGridUserData.cs
+++ b/OpenSim/Data/IGridUserData.cs
@@ -37,6 +37,11 @@ namespace OpenSim.Data
     {
         public string UserID;
         public Dictionary<string, string> Data;
+
+        public GridUserData()
+        {
+            Data = new Dictionary<string, string>();
+        }
     }
 
     /// <summary>
@@ -44,7 +49,7 @@ namespace OpenSim.Data
     /// </summary>
     public interface IGridUserData 
     {
-        GridUserData GetGridUserData(string userID);
-        bool StoreGridUserData(GridUserData data);
+        GridUserData Get(string userID);
+        bool Store(GridUserData data);
     }
 }
\ No newline at end of file