From 10c36a2573caefaf653f18b0b60403a9a597a348 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Fri, 5 Oct 2007 09:41:41 +0000
Subject: * Renamed IUserServices to IUserService
---
.../Communications/CommunicationsManager.cs | 4 +-
OpenSim/Framework/Communications/IUserService.cs | 49 ++++++++++++++++++++++
OpenSim/Framework/Communications/IUserServices.cs | 49 ----------------------
.../Framework/Communications/UserManagerBase.cs | 2 +-
4 files changed, 52 insertions(+), 52 deletions(-)
create mode 100644 OpenSim/Framework/Communications/IUserService.cs
delete mode 100644 OpenSim/Framework/Communications/IUserServices.cs
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index cd5d901..e266b90 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -40,8 +40,8 @@ namespace OpenSim.Framework.Communications
{
public class CommunicationsManager
{
- protected IUserServices m_userService;
- public IUserServices UserService
+ protected IUserService m_userService;
+ public IUserService UserService
{
get { return m_userService; }
}
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
new file mode 100644
index 0000000..55c006f
--- /dev/null
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -0,0 +1,49 @@
+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+using libsecondlife;
+using OpenSim.Framework.Data;
+
+namespace OpenSim.Framework.Communications
+{
+ public interface IUserService
+ {
+ UserProfileData GetUserProfile(string firstName, string lastName);
+ UserProfileData GetUserProfile(string name);
+ UserProfileData GetUserProfile(LLUUID avatarID);
+ void clearUserAgent(LLUUID avatarID);
+
+ UserProfileData SetupMasterUser(string firstName, string lastName);
+ UserProfileData SetupMasterUser(string firstName, string lastName, string password);
+
+ ///
+ ///
+ ///
+ ///
+ void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY);
+ }
+}
diff --git a/OpenSim/Framework/Communications/IUserServices.cs b/OpenSim/Framework/Communications/IUserServices.cs
deleted file mode 100644
index 13dd378..0000000
--- a/OpenSim/Framework/Communications/IUserServices.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) Contributors, http://opensimulator.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using libsecondlife;
-using OpenSim.Framework.Data;
-
-namespace OpenSim.Framework.Communications
-{
- public interface IUserServices
- {
- UserProfileData GetUserProfile(string firstName, string lastName);
- UserProfileData GetUserProfile(string name);
- UserProfileData GetUserProfile(LLUUID avatarID);
- void clearUserAgent(LLUUID avatarID);
-
- UserProfileData SetupMasterUser(string firstName, string lastName);
- UserProfileData SetupMasterUser(string firstName, string lastName, string password);
-
- ///
- ///
- ///
- ///
- void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY);
- }
-}
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index d1bbde1..4dad82e 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -41,7 +41,7 @@ using OpenSim.Framework.Utilities;
namespace OpenSim.Framework.UserManagement
{
- public abstract class UserManagerBase : IUserServices
+ public abstract class UserManagerBase : IUserService
{
public UserConfig _config;
Dictionary _plugins = new Dictionary();
--
cgit v1.1