diff options
| author | Melanie | 2012-01-02 21:41:36 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-02 21:41:36 +0000 |
| commit | a6e305063e9045194cd8348f73f3b75d07f3883e (patch) | |
| tree | c3287856ea47817715da89c737e3ccfe4d4c9f5d /OpenSim/Region/Framework/Interfaces | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Reduce accessibility of some J2KImage/LLImageManager properties and methods t... (diff) | |
| download | opensim-SC_OLD-a6e305063e9045194cd8348f73f3b75d07f3883e.zip opensim-SC_OLD-a6e305063e9045194cd8348f73f3b75d07f3883e.tar.gz opensim-SC_OLD-a6e305063e9045194cd8348f73f3b75d07f3883e.tar.bz2 opensim-SC_OLD-a6e305063e9045194cd8348f73f3b75d07f3883e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
OpenSim/Services/Interfaces/IUserAccountService.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IUserManagement.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs b/OpenSim/Region/Framework/Interfaces/IUserManagement.cs index c66e053..ea0ba59 100644 --- a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs +++ b/OpenSim/Region/Framework/Interfaces/IUserManagement.cs | |||
| @@ -48,5 +48,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 48 | /// <param name="firstName"></param> | 48 | /// <param name="firstName"></param> |
| 49 | /// <param name="profileURL"></param> | 49 | /// <param name="profileURL"></param> |
| 50 | void AddUser(UUID uuid, string firstName, string lastName, string profileURL); | 50 | void AddUser(UUID uuid, string firstName, string lastName, string profileURL); |
| 51 | |||
| 52 | bool IsLocalGridUser(UUID uuid); | ||
| 51 | } | 53 | } |
| 52 | } | 54 | } |