ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 05:05:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2013-12-07 01:19:20 +00:00
parent 6d6b9ab791 8f221a3077
commit ba48816fb6
17 changed files with 305 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Services/Interfaces/IHypergridServices.cs
View File

@@ -43,9 +43,6 @@ namespace OpenSim.Services.Interfaces
}
/// <summary>
/// HG1.5 only
/// </summary>
public interface IUserAgentService
{
bool LoginAgentToGrid(AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason);

5
OpenSim/Services/Interfaces/IUserProfilesService.cs
View File

@@ -57,6 +57,11 @@ namespace OpenSim.Services.Interfaces
bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result);
bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result);
#endregion Profile Properties
#region User Preferences
bool UserPreferencesRequest(ref UserPreferences pref, ref string result);
bool UserPreferencesUpdate(ref UserPreferences pref, ref string result);
#endregion User Preferences
#region Interests
bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result);