* Fission OGS1UserServices into user service and OGS1 user data plugin components

* Make OGS1UserServices inherit from UserManagerBase
* This allows grid mode regions to use the same user data plugin infrastructure as grid servers and standalone OpenSims

2 files changed, 12 insertions, 2 deletions

diff --git a/OpenSim/Data/IUserData.cs b/OpenSim/Data/IUserData.cs
index 1564033..9ac923f 100644
--- a/OpenSim/Data/IUserData.cs
+++ b/OpenSim/Data/IUserData.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -48,8 +49,15 @@ namespace OpenSim.Data
         /// </summary>
         /// <param name="fname">Account firstname</param>
         /// <param name="lname">Account lastname</param>
-        /// <returns>The user data profile</returns>
+        /// <returns>The user data profile.  Null if no user is found</returns>
         UserProfileData GetUserByName(string fname, string lname);
+        
+        /// <summary>
+        /// Get a user from a given uri.
+        /// </summary>  
+        /// <param name="uri"></param>
+        /// <returns>The user data profile.  Null if no user is found.</returns>
+        UserProfileData GetUserByUri(Uri uri);
 
         /// <summary>
         /// Returns a list of UUIDs firstnames and lastnames that match string query entered into the avatar picker.
@@ -63,7 +71,7 @@ namespace OpenSim.Data
         /// Returns the current agent for a user searching by it's UUID
         /// </summary>
         /// <param name="user">The users UUID</param>
-        /// <returns>The current agent session</returns>
+        /// <returns>The current agent session.  Null if no session was found</returns>
         UserAgentData GetAgentByUUID(UUID user);
 
         /// <summary>
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index 0fa9e58..167a837 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -42,6 +43,7 @@ namespace OpenSim.Data
         public abstract UserAgentData GetAgentByUUID(UUID user);
         public abstract UserAgentData GetAgentByName(string name);
         public abstract UserAgentData GetAgentByName(string fname, string lname);
+        public UserProfileData GetUserByUri(Uri uri) { return null; }        
         public abstract void StoreWebLoginKey(UUID agentID, UUID webLoginKey);
         public abstract void AddNewUserProfile(UserProfileData user);
         public abstract bool UpdateUserProfile(UserProfileData user);