Merge branch 'master' of /home/opensim/var/repo/opensim

author: BlueWall 2012-01-12 21:06:27 -0500
committer: BlueWall 2012-01-12 21:06:27 -0500
commit: acbff305f5a9b96dcd0b1534e165f3184a2cfe33 (patch)
tree: 477e5515a242880b35bf108e4b74241820eb27d3 /OpenSim/Region/Framework/Interfaces/IUserManagement.cs
parent: Move some interfaces to a more apropriate place (diff)
parent: Change the default osNpcCreate() to create an 'owned' npc rather than an 'uno... (diff)
download: opensim-SC_OLD-acbff305f5a9b96dcd0b1534e165f3184a2cfe33.zip
opensim-SC_OLD-acbff305f5a9b96dcd0b1534e165f3184a2cfe33.tar.gz
opensim-SC_OLD-acbff305f5a9b96dcd0b1534e165f3184a2cfe33.tar.bz2
opensim-SC_OLD-acbff305f5a9b96dcd0b1534e165f3184a2cfe33.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs b/OpenSim/Region/Framework/Interfaces/IUserManagement.cs
index 54dfaf4..4f62e28 100644
--- a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs
+++ b/OpenSim/Region/Framework/Interfaces/IUserManagement.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <param name="uuid"></param>
        /// <param name="firstName"></param>
        /// <param name="profileURL"></param>
-        void AddUser(UUID uuid, string firstName, string lastName, string profileURL);
+        void AddUser(UUID uuid, string firstName, string lastName, string homeURL);
        bool IsLocalGridUser(UUID uuid);
    }
author	BlueWall	2012-01-12 21:06:27 -0500
committer	BlueWall	2012-01-12 21:06:27 -0500
commit	acbff305f5a9b96dcd0b1534e165f3184a2cfe33 (patch)
tree	477e5515a242880b35bf108e4b74241820eb27d3 /OpenSim/Region/Framework/Interfaces/IUserManagement.cs
parent	Move some interfaces to a more apropriate place (diff)
parent	Change the default osNpcCreate() to create an 'owned' npc rather than an 'uno... (diff)
download	opensim-SC_OLD-acbff305f5a9b96dcd0b1534e165f3184a2cfe33.zip opensim-SC_OLD-acbff305f5a9b96dcd0b1534e165f3184a2cfe33.tar.gz opensim-SC_OLD-acbff305f5a9b96dcd0b1534e165f3184a2cfe33.tar.bz2 opensim-SC_OLD-acbff305f5a9b96dcd0b1534e165f3184a2cfe33.tar.xz

diff --git a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs b/OpenSim/Region/Framework/Interfaces/IUserManagement.cs index 54dfaf4..4f62e28 100644 --- a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs +++ b/OpenSim/Region/Framework/Interfaces/IUserManagement.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Interfaces
50	/// <param name="uuid"></param>	50	/// <param name="uuid"></param>
51	/// <param name="firstName"></param>	51	/// <param name="firstName"></param>
52	/// <param name="profileURL"></param>	52	/// <param name="profileURL"></param>
53	void AddUser(UUID uuid, string firstName, string lastName, string profileURL);	53	void AddUser(UUID uuid, string firstName, string lastName, string homeURL);
54		54
55	bool IsLocalGridUser(UUID uuid);	55	bool IsLocalGridUser(UUID uuid);
56	}	56	}