mirror of
https://github.com/opensim/opensim.git
synced 2026-08-07 17:55:48 +08:00
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
This commit is contained in:
Melanie
75
OpenSim/Services/Interfaces/IUserProfilesService.cs
Normal file
75
OpenSim/Services/Interfaces/IUserProfilesService.cs
Normal file
@@ -0,0 +1,75 @@
|
||||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using OpenSim.Framework;
|
||||
using OpenMetaverse;
|
||||
using OpenMetaverse.StructuredData;
|
||||
|
||||
namespace OpenSim.Services.Interfaces
|
||||
{
|
||||
public interface IUserProfilesService
|
||||
{
|
||||
#region Classifieds
|
||||
OSD AvatarClassifiedsRequest(UUID creatorId);
|
||||
bool ClassifiedUpdate(UserClassifiedAdd ad, ref string result);
|
||||
bool ClassifiedInfoRequest(ref UserClassifiedAdd ad, ref string result);
|
||||
bool ClassifiedDelete(UUID recordId);
|
||||
#endregion Classifieds
|
||||
|
||||
#region Picks
|
||||
OSD AvatarPicksRequest(UUID creatorId);
|
||||
bool PickInfoRequest(ref UserProfilePick pick, ref string result);
|
||||
bool PicksUpdate(ref UserProfilePick pick, ref string result);
|
||||
bool PicksDelete(UUID pickId);
|
||||
#endregion Picks
|
||||
|
||||
#region Notes
|
||||
bool AvatarNotesRequest(ref UserProfileNotes note);
|
||||
bool NotesUpdate(ref UserProfileNotes note, ref string result);
|
||||
#endregion Notes
|
||||
|
||||
#region Profile Properties
|
||||
bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result);
|
||||
bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result);
|
||||
#endregion Profile Properties
|
||||
|
||||
#region Interests
|
||||
bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result);
|
||||
#endregion Interests
|
||||
|
||||
#region Utility
|
||||
OSD AvatarImageAssetsRequest(UUID avatarId);
|
||||
#endregion Utility
|
||||
|
||||
#region UserData
|
||||
bool RequestUserAppData(ref UserAppData prop, ref string result);
|
||||
bool SetUserAppData(UserAppData prop, ref string result);
|
||||
#endregion UserData
|
||||
}
|
||||
}
|
||||
|
||||
187
OpenSim/Services/UserProfilesService/UserProfilesService.cs
Normal file
187
OpenSim/Services/UserProfilesService/UserProfilesService.cs
Normal file
@@ -0,0 +1,187 @@
|
||||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
using Nini.Config;
|
||||
using log4net;
|
||||
using OpenSim.Server.Base;
|
||||
using OpenSim.Services.Interfaces;
|
||||
using OpenSim.Services.UserAccountService;
|
||||
using OpenSim.Data;
|
||||
using OpenMetaverse;
|
||||
using OpenMetaverse.StructuredData;
|
||||
using OpenSim.Framework;
|
||||
|
||||
namespace OpenSim.Services.ProfilesService
|
||||
{
|
||||
public class UserProfilesService: UserProfilesServiceBase, IUserProfilesService
|
||||
{
|
||||
static readonly ILog m_log =
|
||||
LogManager.GetLogger(
|
||||
MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
IUserAccountService userAccounts;
|
||||
IAuthenticationService authService;
|
||||
|
||||
public UserProfilesService(IConfigSource config, string configName):
|
||||
base(config, configName)
|
||||
{
|
||||
IConfig Config = config.Configs[configName];
|
||||
if (Config == null)
|
||||
{
|
||||
m_log.Warn("[PROFILES]: No configuration found!");
|
||||
return;
|
||||
}
|
||||
Object[] args = null;
|
||||
|
||||
args = new Object[] { config };
|
||||
string accountService = Config.GetString("UserAccountService", String.Empty);
|
||||
if (accountService != string.Empty)
|
||||
userAccounts = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
|
||||
|
||||
args = new Object[] { config };
|
||||
string authServiceConfig = Config.GetString("AuthenticationServiceModule", String.Empty);
|
||||
if (accountService != string.Empty)
|
||||
authService = ServerUtils.LoadPlugin<IAuthenticationService>(authServiceConfig, args);
|
||||
}
|
||||
|
||||
#region Classifieds
|
||||
public OSD AvatarClassifiedsRequest(UUID creatorId)
|
||||
{
|
||||
OSDArray records = ProfilesData.GetClassifiedRecords(creatorId);
|
||||
|
||||
return records;
|
||||
}
|
||||
|
||||
public bool ClassifiedUpdate(UserClassifiedAdd ad, ref string result)
|
||||
{
|
||||
if(!ProfilesData.UpdateClassifiedRecord(ad, ref result))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
result = "success";
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool ClassifiedDelete(UUID recordId)
|
||||
{
|
||||
if(ProfilesData.DeleteClassifiedRecord(recordId))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public bool ClassifiedInfoRequest(ref UserClassifiedAdd ad, ref string result)
|
||||
{
|
||||
if(ProfilesData.GetClassifiedInfo(ref ad, ref result))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
#endregion Classifieds
|
||||
|
||||
#region Picks
|
||||
public OSD AvatarPicksRequest(UUID creatorId)
|
||||
{
|
||||
OSDArray records = ProfilesData.GetAvatarPicks(creatorId);
|
||||
|
||||
return records;
|
||||
}
|
||||
|
||||
public bool PickInfoRequest(ref UserProfilePick pick, ref string result)
|
||||
{
|
||||
pick = ProfilesData.GetPickInfo(pick.CreatorId, pick.PickId);
|
||||
result = "OK";
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool PicksUpdate(ref UserProfilePick pick, ref string result)
|
||||
{
|
||||
return ProfilesData.UpdatePicksRecord(pick);
|
||||
}
|
||||
|
||||
public bool PicksDelete(UUID pickId)
|
||||
{
|
||||
return ProfilesData.DeletePicksRecord(pickId);
|
||||
}
|
||||
#endregion Picks
|
||||
|
||||
#region Notes
|
||||
public bool AvatarNotesRequest(ref UserProfileNotes note)
|
||||
{
|
||||
return ProfilesData.GetAvatarNotes(ref note);
|
||||
}
|
||||
|
||||
public bool NotesUpdate(ref UserProfileNotes note, ref string result)
|
||||
{
|
||||
return ProfilesData.UpdateAvatarNotes(ref note, ref result);
|
||||
}
|
||||
#endregion Notes
|
||||
|
||||
#region Profile Properties
|
||||
public bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result)
|
||||
{
|
||||
return ProfilesData.GetAvatarProperties(ref prop, ref result);
|
||||
}
|
||||
|
||||
public bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result)
|
||||
{
|
||||
return ProfilesData.UpdateAvatarProperties(ref prop, ref result);
|
||||
}
|
||||
#endregion Profile Properties
|
||||
|
||||
#region Interests
|
||||
public bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result)
|
||||
{
|
||||
return ProfilesData.UpdateAvatarInterests(prop, ref result);
|
||||
}
|
||||
#endregion Interests
|
||||
|
||||
#region Utility
|
||||
public OSD AvatarImageAssetsRequest(UUID avatarId)
|
||||
{
|
||||
OSDArray records = ProfilesData.GetUserImageAssets(avatarId);
|
||||
return records;
|
||||
}
|
||||
#endregion Utility
|
||||
|
||||
#region UserData
|
||||
public bool RequestUserAppData(ref UserAppData prop, ref string result)
|
||||
{
|
||||
return ProfilesData.GetUserAppData(ref prop, ref result);
|
||||
}
|
||||
|
||||
public bool SetUserAppData(UserAppData prop, ref string result)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
#endregion UserData
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
using Nini.Config;
|
||||
using log4net;
|
||||
using OpenSim.Services.Base;
|
||||
using OpenSim.Data;
|
||||
|
||||
namespace OpenSim.Services.ProfilesService
|
||||
{
|
||||
public class UserProfilesServiceBase: ServiceBase
|
||||
{
|
||||
static readonly ILog m_log =
|
||||
LogManager.GetLogger(
|
||||
MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
public IProfilesData ProfilesData;
|
||||
|
||||
public string ConfigName
|
||||
{
|
||||
get; private set;
|
||||
}
|
||||
|
||||
public UserProfilesServiceBase(IConfigSource config, string configName):
|
||||
base(config)
|
||||
{
|
||||
if(string.IsNullOrEmpty(configName))
|
||||
{
|
||||
m_log.WarnFormat("[PROFILES]: Configuration section not given!");
|
||||
return;
|
||||
}
|
||||
|
||||
string dllName = String.Empty;
|
||||
string connString = null;
|
||||
string realm = String.Empty;
|
||||
|
||||
IConfig dbConfig = config.Configs["DatabaseService"];
|
||||
if (dbConfig != null)
|
||||
{
|
||||
if (dllName == String.Empty)
|
||||
dllName = dbConfig.GetString("StorageProvider", String.Empty);
|
||||
if (string.IsNullOrEmpty(connString))
|
||||
connString = dbConfig.GetString("ConnectionString", String.Empty);
|
||||
}
|
||||
|
||||
IConfig ProfilesConfig = config.Configs[configName];
|
||||
if (ProfilesConfig != null)
|
||||
{
|
||||
connString = ProfilesConfig.GetString("ConnectionString", connString);
|
||||
realm = ProfilesConfig.GetString("Realm", realm);
|
||||
}
|
||||
|
||||
ProfilesData = LoadPlugin<IProfilesData>(dllName, new Object[] { connString });
|
||||
if (ProfilesData == null)
|
||||
throw new Exception("Could not find a storage interface in the given module");
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user