diff options
author | Melanie | 2013-12-07 01:19:20 +0000 |
---|---|---|
committer | Melanie | 2013-12-07 01:19:20 +0000 |
commit | ba48816fb676d17298e03e82579fc4f54fa48800 (patch) | |
tree | cfa25ad1116eb0f7bd42eb2d2ebecf19eae939e8 /OpenSim/Services/Interfaces | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-ba48816fb676d17298e03e82579fc4f54fa48800.zip opensim-SC_OLD-ba48816fb676d17298e03e82579fc4f54fa48800.tar.gz opensim-SC_OLD-ba48816fb676d17298e03e82579fc4f54fa48800.tar.bz2 opensim-SC_OLD-ba48816fb676d17298e03e82579fc4f54fa48800.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services/Interfaces')
-rw-r--r-- | OpenSim/Services/Interfaces/IHypergridServices.cs | 3 | ||||
-rw-r--r-- | OpenSim/Services/Interfaces/IUserProfilesService.cs | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Services/Interfaces/IHypergridServices.cs b/OpenSim/Services/Interfaces/IHypergridServices.cs index f9e7f08..05e175a 100644 --- a/OpenSim/Services/Interfaces/IHypergridServices.cs +++ b/OpenSim/Services/Interfaces/IHypergridServices.cs | |||
@@ -43,9 +43,6 @@ namespace OpenSim.Services.Interfaces | |||
43 | 43 | ||
44 | } | 44 | } |
45 | 45 | ||
46 | /// <summary> | ||
47 | /// HG1.5 only | ||
48 | /// </summary> | ||
49 | public interface IUserAgentService | 46 | public interface IUserAgentService |
50 | { | 47 | { |
51 | bool LoginAgentToGrid(AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason); | 48 | bool LoginAgentToGrid(AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason); |
diff --git a/OpenSim/Services/Interfaces/IUserProfilesService.cs b/OpenSim/Services/Interfaces/IUserProfilesService.cs index 319d307..121baa8 100644 --- a/OpenSim/Services/Interfaces/IUserProfilesService.cs +++ b/OpenSim/Services/Interfaces/IUserProfilesService.cs | |||
@@ -57,6 +57,11 @@ namespace OpenSim.Services.Interfaces | |||
57 | bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result); | 57 | bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result); |
58 | bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result); | 58 | bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result); |
59 | #endregion Profile Properties | 59 | #endregion Profile Properties |
60 | |||
61 | #region User Preferences | ||
62 | bool UserPreferencesRequest(ref UserPreferences pref, ref string result); | ||
63 | bool UserPreferencesUpdate(ref UserPreferences pref, ref string result); | ||
64 | #endregion User Preferences | ||
60 | 65 | ||
61 | #region Interests | 66 | #region Interests |
62 | bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result); | 67 | bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result); |