diff options
| author | Melanie | 2012-01-05 08:15:33 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-05 08:15:33 +0000 |
| commit | 1ebc9d04aa33e18e22ee2f03465bc5950c3544ce (patch) | |
| tree | 3e7e39255ad455b59434979d47db7da243ac3dd6 /OpenSim/Services/Interfaces | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-1ebc9d04aa33e18e22ee2f03465bc5950c3544ce.zip opensim-SC_OLD-1ebc9d04aa33e18e22ee2f03465bc5950c3544ce.tar.gz opensim-SC_OLD-1ebc9d04aa33e18e22ee2f03465bc5950c3544ce.tar.bz2 opensim-SC_OLD-1ebc9d04aa33e18e22ee2f03465bc5950c3544ce.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Services/Interfaces')
| -rw-r--r-- | OpenSim/Services/Interfaces/IHypergridServices.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Services/Interfaces/IHypergridServices.cs b/OpenSim/Services/Interfaces/IHypergridServices.cs index e86ec51..5b293ac 100644 --- a/OpenSim/Services/Interfaces/IHypergridServices.cs +++ b/OpenSim/Services/Interfaces/IHypergridServices.cs | |||
| @@ -55,6 +55,7 @@ namespace OpenSim.Services.Interfaces | |||
| 55 | void LogoutAgent(UUID userID, UUID sessionID); | 55 | void LogoutAgent(UUID userID, UUID sessionID); |
| 56 | GridRegion GetHomeRegion(UUID userID, out Vector3 position, out Vector3 lookAt); | 56 | GridRegion GetHomeRegion(UUID userID, out Vector3 position, out Vector3 lookAt); |
| 57 | Dictionary<string, object> GetServerURLs(UUID userID); | 57 | Dictionary<string, object> GetServerURLs(UUID userID); |
| 58 | Dictionary<string,object> GetUserInfo(UUID userID); | ||
| 58 | 59 | ||
| 59 | string LocateUser(UUID userID); | 60 | string LocateUser(UUID userID); |
| 60 | // Tries to get the universal user identifier for the targetUserId | 61 | // Tries to get the universal user identifier for the targetUserId |