Same treatment for the MessagingServer... added OpenSim.Grid.MessagingServer.Modules for the modules/components of it.
MW
parent
021225675f
commit
98178b4e9f
|
|
@ -1,213 +1,213 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
* * Redistributions of source code must retain the above copyright
|
* * Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* * Neither the name of the OpenSim Project nor the
|
* * Neither the name of the OpenSim Project nor the
|
||||||
* names of its contributors may be used to endorse or promote products
|
* names of its contributors may be used to endorse or promote products
|
||||||
* derived from this software without specific prior written permission.
|
* derived from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* 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
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Timers;
|
using System.Timers;
|
||||||
using log4net;
|
using log4net;
|
||||||
using Nwc.XmlRpc;
|
using Nwc.XmlRpc;
|
||||||
using OpenMetaverse;
|
using OpenMetaverse;
|
||||||
using OpenSim.Data;
|
using OpenSim.Data;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
using OpenSim.Grid.Framework;
|
using OpenSim.Grid.Framework;
|
||||||
using Timer = System.Timers.Timer;
|
using Timer = System.Timers.Timer;
|
||||||
|
|
||||||
namespace OpenSim.Grid.MessagingServer
|
namespace OpenSim.Grid.MessagingServer.Modules
|
||||||
{
|
{
|
||||||
public class MessageRegionModule : IMessageRegionService
|
public class MessageRegionModule : IMessageRegionService
|
||||||
{
|
{
|
||||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
private MessageServerConfig m_cfg;
|
private MessageServerConfig m_cfg;
|
||||||
|
|
||||||
private IMessageUserServerService m_userServerModule;
|
private IMessageUserServerService m_userServerModule;
|
||||||
|
|
||||||
private IUGAIMCore m_messageCore;
|
private IUGAIMCore m_messageCore;
|
||||||
|
|
||||||
// a dictionary of all current regions this server knows about
|
// a dictionary of all current regions this server knows about
|
||||||
private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong, RegionProfileData>();
|
private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong, RegionProfileData>();
|
||||||
|
|
||||||
public MessageRegionModule(MessageServerConfig config, IUGAIMCore messageCore)
|
public MessageRegionModule(MessageServerConfig config, IUGAIMCore messageCore)
|
||||||
{
|
{
|
||||||
m_cfg = config;
|
m_cfg = config;
|
||||||
m_messageCore = messageCore;
|
m_messageCore = messageCore;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Initialise()
|
public void Initialise()
|
||||||
{
|
{
|
||||||
m_messageCore.RegisterInterface<IMessageRegionService>(this);
|
m_messageCore.RegisterInterface<IMessageRegionService>(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void PostInitialise()
|
public void PostInitialise()
|
||||||
{
|
{
|
||||||
IMessageUserServerService messageUserServer;
|
IMessageUserServerService messageUserServer;
|
||||||
if (m_messageCore.TryGet<IMessageUserServerService>(out messageUserServer))
|
if (m_messageCore.TryGet<IMessageUserServerService>(out messageUserServer))
|
||||||
{
|
{
|
||||||
m_userServerModule = messageUserServer;
|
m_userServerModule = messageUserServer;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RegisterHandlers()
|
public void RegisterHandlers()
|
||||||
{
|
{
|
||||||
//have these in separate method as some servers restart the http server and reregister all the handlers.
|
//have these in separate method as some servers restart the http server and reregister all the handlers.
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets and caches a RegionInfo object from the gridserver based on regionhandle
|
/// Gets and caches a RegionInfo object from the gridserver based on regionhandle
|
||||||
/// if the regionhandle is already cached, use the cached values
|
/// if the regionhandle is already cached, use the cached values
|
||||||
/// Gets called by lots of threads!!!!!
|
/// Gets called by lots of threads!!!!!
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="regionhandle">handle to the XY of the region we're looking for</param>
|
/// <param name="regionhandle">handle to the XY of the region we're looking for</param>
|
||||||
/// <returns>A RegionInfo object to stick in the presence info</returns>
|
/// <returns>A RegionInfo object to stick in the presence info</returns>
|
||||||
public RegionProfileData GetRegionInfo(ulong regionhandle)
|
public RegionProfileData GetRegionInfo(ulong regionhandle)
|
||||||
{
|
{
|
||||||
RegionProfileData regionInfo = null;
|
RegionProfileData regionInfo = null;
|
||||||
|
|
||||||
lock (m_regionInfoCache)
|
lock (m_regionInfoCache)
|
||||||
{
|
{
|
||||||
m_regionInfoCache.TryGetValue(regionhandle, out regionInfo);
|
m_regionInfoCache.TryGetValue(regionhandle, out regionInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (regionInfo == null) // not found in cache
|
if (regionInfo == null) // not found in cache
|
||||||
{
|
{
|
||||||
regionInfo = RequestRegionInfo(regionhandle);
|
regionInfo = RequestRegionInfo(regionhandle);
|
||||||
|
|
||||||
if (regionInfo != null) // lookup was successful
|
if (regionInfo != null) // lookup was successful
|
||||||
{
|
{
|
||||||
lock (m_regionInfoCache)
|
lock (m_regionInfoCache)
|
||||||
{
|
{
|
||||||
m_regionInfoCache[regionhandle] = regionInfo;
|
m_regionInfoCache[regionhandle] = regionInfo;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return regionInfo;
|
return regionInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int ClearRegionCache()
|
public int ClearRegionCache()
|
||||||
{
|
{
|
||||||
int cachecount = 0;
|
int cachecount = 0;
|
||||||
|
|
||||||
lock (m_regionInfoCache)
|
lock (m_regionInfoCache)
|
||||||
{
|
{
|
||||||
cachecount = m_regionInfoCache.Count;
|
cachecount = m_regionInfoCache.Count;
|
||||||
m_regionInfoCache.Clear();
|
m_regionInfoCache.Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
return cachecount;
|
return cachecount;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get RegionProfileData from the GridServer.
|
/// Get RegionProfileData from the GridServer.
|
||||||
/// We'll cache this information in GetRegionInfo and use it for presence updates
|
/// We'll cache this information in GetRegionInfo and use it for presence updates
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="regionHandle"></param>
|
/// <param name="regionHandle"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public RegionProfileData RequestRegionInfo(ulong regionHandle)
|
public RegionProfileData RequestRegionInfo(ulong regionHandle)
|
||||||
{
|
{
|
||||||
RegionProfileData regionProfile = null;
|
RegionProfileData regionProfile = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Hashtable requestData = new Hashtable();
|
Hashtable requestData = new Hashtable();
|
||||||
requestData["region_handle"] = regionHandle.ToString();
|
requestData["region_handle"] = regionHandle.ToString();
|
||||||
requestData["authkey"] = m_cfg.GridSendKey;
|
requestData["authkey"] = m_cfg.GridSendKey;
|
||||||
|
|
||||||
ArrayList SendParams = new ArrayList();
|
ArrayList SendParams = new ArrayList();
|
||||||
SendParams.Add(requestData);
|
SendParams.Add(requestData);
|
||||||
|
|
||||||
XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
|
XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
|
||||||
|
|
||||||
XmlRpcResponse GridResp = GridReq.Send(m_cfg.GridServerURL, 3000);
|
XmlRpcResponse GridResp = GridReq.Send(m_cfg.GridServerURL, 3000);
|
||||||
|
|
||||||
Hashtable responseData = (Hashtable)GridResp.Value;
|
Hashtable responseData = (Hashtable)GridResp.Value;
|
||||||
|
|
||||||
if (responseData.ContainsKey("error"))
|
if (responseData.ContainsKey("error"))
|
||||||
{
|
{
|
||||||
m_log.Error("[GRID]: error received from grid server" + responseData["error"]);
|
m_log.Error("[GRID]: error received from grid server" + responseData["error"]);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint regX = Convert.ToUInt32((string)responseData["region_locx"]);
|
uint regX = Convert.ToUInt32((string)responseData["region_locx"]);
|
||||||
uint regY = Convert.ToUInt32((string)responseData["region_locy"]);
|
uint regY = Convert.ToUInt32((string)responseData["region_locy"]);
|
||||||
string internalIpStr = (string)responseData["sim_ip"];
|
string internalIpStr = (string)responseData["sim_ip"];
|
||||||
|
|
||||||
regionProfile = new RegionProfileData();
|
regionProfile = new RegionProfileData();
|
||||||
regionProfile.httpPort = (uint)Convert.ToInt32((string)responseData["http_port"]);
|
regionProfile.httpPort = (uint)Convert.ToInt32((string)responseData["http_port"]);
|
||||||
regionProfile.httpServerURI = "http://" + internalIpStr + ":" + regionProfile.httpPort + "/";
|
regionProfile.httpServerURI = "http://" + internalIpStr + ":" + regionProfile.httpPort + "/";
|
||||||
regionProfile.regionHandle = Utils.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize));
|
regionProfile.regionHandle = Utils.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize));
|
||||||
regionProfile.regionLocX = regX;
|
regionProfile.regionLocX = regX;
|
||||||
regionProfile.regionLocY = regY;
|
regionProfile.regionLocY = regY;
|
||||||
|
|
||||||
regionProfile.remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]);
|
regionProfile.remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]);
|
||||||
regionProfile.UUID = new UUID((string)responseData["region_UUID"]);
|
regionProfile.UUID = new UUID((string)responseData["region_UUID"]);
|
||||||
regionProfile.regionName = (string)responseData["region_name"];
|
regionProfile.regionName = (string)responseData["region_name"];
|
||||||
}
|
}
|
||||||
catch (WebException)
|
catch (WebException)
|
||||||
{
|
{
|
||||||
m_log.Error("[GRID]: " +
|
m_log.Error("[GRID]: " +
|
||||||
"Region lookup failed for: " + regionHandle.ToString() +
|
"Region lookup failed for: " + regionHandle.ToString() +
|
||||||
" - Is the GridServer down?");
|
" - Is the GridServer down?");
|
||||||
}
|
}
|
||||||
|
|
||||||
return regionProfile;
|
return regionProfile;
|
||||||
}
|
}
|
||||||
|
|
||||||
public XmlRpcResponse RegionStartup(XmlRpcRequest request)
|
public XmlRpcResponse RegionStartup(XmlRpcRequest request)
|
||||||
{
|
{
|
||||||
Hashtable requestData = (Hashtable)request.Params[0];
|
Hashtable requestData = (Hashtable)request.Params[0];
|
||||||
Hashtable result = new Hashtable();
|
Hashtable result = new Hashtable();
|
||||||
result["success"] = "FALSE";
|
result["success"] = "FALSE";
|
||||||
|
|
||||||
if (m_userServerModule.SendToUserServer(requestData, "region_startup"))
|
if (m_userServerModule.SendToUserServer(requestData, "region_startup"))
|
||||||
result["success"] = "TRUE";
|
result["success"] = "TRUE";
|
||||||
|
|
||||||
XmlRpcResponse response = new XmlRpcResponse();
|
XmlRpcResponse response = new XmlRpcResponse();
|
||||||
response.Value = result;
|
response.Value = result;
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
public XmlRpcResponse RegionShutdown(XmlRpcRequest request)
|
public XmlRpcResponse RegionShutdown(XmlRpcRequest request)
|
||||||
{
|
{
|
||||||
Hashtable requestData = (Hashtable)request.Params[0];
|
Hashtable requestData = (Hashtable)request.Params[0];
|
||||||
Hashtable result = new Hashtable();
|
Hashtable result = new Hashtable();
|
||||||
result["success"] = "FALSE";
|
result["success"] = "FALSE";
|
||||||
|
|
||||||
if (m_userServerModule.SendToUserServer(requestData, "region_shutdown"))
|
if (m_userServerModule.SendToUserServer(requestData, "region_shutdown"))
|
||||||
result["success"] = "TRUE";
|
result["success"] = "TRUE";
|
||||||
|
|
||||||
XmlRpcResponse response = new XmlRpcResponse();
|
XmlRpcResponse response = new XmlRpcResponse();
|
||||||
response.Value = result;
|
response.Value = result;
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,488 +1,488 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
* * Redistributions of source code must retain the above copyright
|
* * Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* * Neither the name of the OpenSim Project nor the
|
* * Neither the name of the OpenSim Project nor the
|
||||||
* names of its contributors may be used to endorse or promote products
|
* names of its contributors may be used to endorse or promote products
|
||||||
* derived from this software without specific prior written permission.
|
* derived from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* 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
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Timers;
|
using System.Timers;
|
||||||
using log4net;
|
using log4net;
|
||||||
using Nwc.XmlRpc;
|
using Nwc.XmlRpc;
|
||||||
using OpenMetaverse;
|
using OpenMetaverse;
|
||||||
using OpenSim.Data;
|
using OpenSim.Data;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
using OpenSim.Grid.Framework;
|
using OpenSim.Grid.Framework;
|
||||||
using Timer=System.Timers.Timer;
|
using Timer=System.Timers.Timer;
|
||||||
|
|
||||||
namespace OpenSim.Grid.MessagingServer
|
namespace OpenSim.Grid.MessagingServer.Modules
|
||||||
{
|
{
|
||||||
public class MessageService
|
public class MessageService
|
||||||
{
|
{
|
||||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
private MessageServerConfig m_cfg;
|
private MessageServerConfig m_cfg;
|
||||||
private UserDataBaseService m_userDataBaseService;
|
private UserDataBaseService m_userDataBaseService;
|
||||||
|
|
||||||
private IUGAIMCore m_messageCore;
|
private IUGAIMCore m_messageCore;
|
||||||
|
|
||||||
private IMessageUserServerService m_userServerModule;
|
private IMessageUserServerService m_userServerModule;
|
||||||
private IMessageRegionService m_regionModule;
|
private IMessageRegionService m_regionModule;
|
||||||
|
|
||||||
// a dictionary of all current presences this server knows about
|
// a dictionary of all current presences this server knows about
|
||||||
private Dictionary<UUID, UserPresenceData> m_presences = new Dictionary<UUID,UserPresenceData>();
|
private Dictionary<UUID, UserPresenceData> m_presences = new Dictionary<UUID,UserPresenceData>();
|
||||||
|
|
||||||
public MessageService(MessageServerConfig cfg, IUGAIMCore messageCore, UserDataBaseService userDataBaseService)
|
public MessageService(MessageServerConfig cfg, IUGAIMCore messageCore, UserDataBaseService userDataBaseService)
|
||||||
{
|
{
|
||||||
m_cfg = cfg;
|
m_cfg = cfg;
|
||||||
m_messageCore = messageCore;
|
m_messageCore = messageCore;
|
||||||
|
|
||||||
m_userDataBaseService = userDataBaseService;
|
m_userDataBaseService = userDataBaseService;
|
||||||
|
|
||||||
//???
|
//???
|
||||||
UserConfig uc = new UserConfig();
|
UserConfig uc = new UserConfig();
|
||||||
uc.DatabaseConnect = cfg.DatabaseConnect;
|
uc.DatabaseConnect = cfg.DatabaseConnect;
|
||||||
uc.DatabaseProvider = cfg.DatabaseProvider;
|
uc.DatabaseProvider = cfg.DatabaseProvider;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Initialise()
|
public void Initialise()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public void PostInitialise()
|
public void PostInitialise()
|
||||||
{
|
{
|
||||||
IMessageUserServerService messageUserServer;
|
IMessageUserServerService messageUserServer;
|
||||||
if (m_messageCore.TryGet<IMessageUserServerService>(out messageUserServer))
|
if (m_messageCore.TryGet<IMessageUserServerService>(out messageUserServer))
|
||||||
{
|
{
|
||||||
m_userServerModule = messageUserServer;
|
m_userServerModule = messageUserServer;
|
||||||
}
|
}
|
||||||
|
|
||||||
IMessageRegionService messageRegion;
|
IMessageRegionService messageRegion;
|
||||||
if (m_messageCore.TryGet<IMessageRegionService>(out messageRegion))
|
if (m_messageCore.TryGet<IMessageRegionService>(out messageRegion))
|
||||||
{
|
{
|
||||||
m_regionModule = messageRegion;
|
m_regionModule = messageRegion;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RegisterHandlers()
|
public void RegisterHandlers()
|
||||||
{
|
{
|
||||||
//have these in separate method as some servers restart the http server and reregister all the handlers.
|
//have these in separate method as some servers restart the http server and reregister all the handlers.
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#region FriendList Methods
|
#region FriendList Methods
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Process Friendlist subscriptions for a user
|
/// Process Friendlist subscriptions for a user
|
||||||
/// The login method calls this for a User
|
/// The login method calls this for a User
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="userpresence">The Agent we're processing the friendlist subscriptions for</param>
|
/// <param name="userpresence">The Agent we're processing the friendlist subscriptions for</param>
|
||||||
private void ProcessFriendListSubscriptions(UserPresenceData userpresence)
|
private void ProcessFriendListSubscriptions(UserPresenceData userpresence)
|
||||||
{
|
{
|
||||||
lock (m_presences)
|
lock (m_presences)
|
||||||
{
|
{
|
||||||
m_presences[userpresence.agentData.AgentID] = userpresence;
|
m_presences[userpresence.agentData.AgentID] = userpresence;
|
||||||
}
|
}
|
||||||
|
|
||||||
Dictionary<UUID, FriendListItem> uFriendList = userpresence.friendData;
|
Dictionary<UUID, FriendListItem> uFriendList = userpresence.friendData;
|
||||||
foreach (KeyValuePair<UUID, FriendListItem> pair in uFriendList)
|
foreach (KeyValuePair<UUID, FriendListItem> pair in uFriendList)
|
||||||
{
|
{
|
||||||
UserPresenceData friendup = null;
|
UserPresenceData friendup = null;
|
||||||
lock (m_presences)
|
lock (m_presences)
|
||||||
{
|
{
|
||||||
m_presences.TryGetValue(pair.Key, out friendup);
|
m_presences.TryGetValue(pair.Key, out friendup);
|
||||||
}
|
}
|
||||||
if (friendup != null)
|
if (friendup != null)
|
||||||
{
|
{
|
||||||
SubscribeToPresenceUpdates(userpresence, friendup, pair.Value);
|
SubscribeToPresenceUpdates(userpresence, friendup, pair.Value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Enqueues a presence update, sending info about user 'talkingAbout' to user 'receiver'.
|
/// Enqueues a presence update, sending info about user 'talkingAbout' to user 'receiver'.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="talkingAbout">We are sending presence information about this user.</param>
|
/// <param name="talkingAbout">We are sending presence information about this user.</param>
|
||||||
/// <param name="receiver">We are sending the presence update to this user</param>
|
/// <param name="receiver">We are sending the presence update to this user</param>
|
||||||
private void enqueuePresenceUpdate(UserPresenceData talkingAbout, UserPresenceData receiver)
|
private void enqueuePresenceUpdate(UserPresenceData talkingAbout, UserPresenceData receiver)
|
||||||
{
|
{
|
||||||
UserAgentData p2Handle = m_userDataBaseService.GetUserAgentData(receiver.agentData.AgentID);
|
UserAgentData p2Handle = m_userDataBaseService.GetUserAgentData(receiver.agentData.AgentID);
|
||||||
if (p2Handle != null)
|
if (p2Handle != null)
|
||||||
{
|
{
|
||||||
if (receiver.lookupUserRegionYN)
|
if (receiver.lookupUserRegionYN)
|
||||||
{
|
{
|
||||||
receiver.regionData.regionHandle = p2Handle.Handle;
|
receiver.regionData.regionHandle = p2Handle.Handle;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
receiver.lookupUserRegionYN = true; // TODO Huh?
|
receiver.lookupUserRegionYN = true; // TODO Huh?
|
||||||
}
|
}
|
||||||
|
|
||||||
PresenceInformer friendlistupdater = new PresenceInformer();
|
PresenceInformer friendlistupdater = new PresenceInformer();
|
||||||
friendlistupdater.presence1 = talkingAbout;
|
friendlistupdater.presence1 = talkingAbout;
|
||||||
friendlistupdater.presence2 = receiver;
|
friendlistupdater.presence2 = receiver;
|
||||||
friendlistupdater.OnGetRegionData += m_regionModule.GetRegionInfo;
|
friendlistupdater.OnGetRegionData += m_regionModule.GetRegionInfo;
|
||||||
friendlistupdater.OnDone += PresenceUpdateDone;
|
friendlistupdater.OnDone += PresenceUpdateDone;
|
||||||
WaitCallback cb = new WaitCallback(friendlistupdater.go);
|
WaitCallback cb = new WaitCallback(friendlistupdater.go);
|
||||||
ThreadPool.QueueUserWorkItem(cb);
|
ThreadPool.QueueUserWorkItem(cb);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_log.WarnFormat("no data found for user {0}", receiver.agentData.AgentID);
|
m_log.WarnFormat("no data found for user {0}", receiver.agentData.AgentID);
|
||||||
// Skip because we can't find any data on the user
|
// Skip because we can't find any data on the user
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Does the necessary work to subscribe one agent to another's presence notifications
|
/// Does the necessary work to subscribe one agent to another's presence notifications
|
||||||
/// Gets called by ProcessFriendListSubscriptions. You shouldn't call this directly
|
/// Gets called by ProcessFriendListSubscriptions. You shouldn't call this directly
|
||||||
/// unless you know what you're doing
|
/// unless you know what you're doing
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="userpresence">P1</param>
|
/// <param name="userpresence">P1</param>
|
||||||
/// <param name="friendpresence">P2</param>
|
/// <param name="friendpresence">P2</param>
|
||||||
/// <param name="uFriendListItem"></param>
|
/// <param name="uFriendListItem"></param>
|
||||||
private void SubscribeToPresenceUpdates(UserPresenceData userpresence,
|
private void SubscribeToPresenceUpdates(UserPresenceData userpresence,
|
||||||
UserPresenceData friendpresence,
|
UserPresenceData friendpresence,
|
||||||
FriendListItem uFriendListItem)
|
FriendListItem uFriendListItem)
|
||||||
{
|
{
|
||||||
// Can the friend see me online?
|
// Can the friend see me online?
|
||||||
if ((uFriendListItem.FriendListOwnerPerms & (uint)FriendRights.CanSeeOnline) != 0)
|
if ((uFriendListItem.FriendListOwnerPerms & (uint)FriendRights.CanSeeOnline) != 0)
|
||||||
{
|
{
|
||||||
// tell user to update friend about user's presence changes
|
// tell user to update friend about user's presence changes
|
||||||
if (!userpresence.subscriptionData.Contains(friendpresence.agentData.AgentID))
|
if (!userpresence.subscriptionData.Contains(friendpresence.agentData.AgentID))
|
||||||
{
|
{
|
||||||
userpresence.subscriptionData.Add(friendpresence.agentData.AgentID);
|
userpresence.subscriptionData.Add(friendpresence.agentData.AgentID);
|
||||||
}
|
}
|
||||||
|
|
||||||
// send an update about user's presence to the friend
|
// send an update about user's presence to the friend
|
||||||
enqueuePresenceUpdate(userpresence, friendpresence);
|
enqueuePresenceUpdate(userpresence, friendpresence);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Can I see the friend online?
|
// Can I see the friend online?
|
||||||
if ((uFriendListItem.FriendPerms & (uint)FriendRights.CanSeeOnline) != 0)
|
if ((uFriendListItem.FriendPerms & (uint)FriendRights.CanSeeOnline) != 0)
|
||||||
{
|
{
|
||||||
// tell friend to update user about friend's presence changes
|
// tell friend to update user about friend's presence changes
|
||||||
if (!friendpresence.subscriptionData.Contains(userpresence.agentData.AgentID))
|
if (!friendpresence.subscriptionData.Contains(userpresence.agentData.AgentID))
|
||||||
{
|
{
|
||||||
friendpresence.subscriptionData.Add(userpresence.agentData.AgentID);
|
friendpresence.subscriptionData.Add(userpresence.agentData.AgentID);
|
||||||
}
|
}
|
||||||
|
|
||||||
// send an update about friend's presence to user.
|
// send an update about friend's presence to user.
|
||||||
enqueuePresenceUpdate(friendpresence, userpresence);
|
enqueuePresenceUpdate(friendpresence, userpresence);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Logoff Processor. Call this to clean up agent presence data and send logoff presence notifications
|
/// Logoff Processor. Call this to clean up agent presence data and send logoff presence notifications
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="AgentID"></param>
|
/// <param name="AgentID"></param>
|
||||||
private void ProcessLogOff(UUID AgentID)
|
private void ProcessLogOff(UUID AgentID)
|
||||||
{
|
{
|
||||||
m_log.Info("[LOGOFF]: Processing Logoff");
|
m_log.Info("[LOGOFF]: Processing Logoff");
|
||||||
|
|
||||||
UserPresenceData userPresence = null;
|
UserPresenceData userPresence = null;
|
||||||
lock (m_presences)
|
lock (m_presences)
|
||||||
{
|
{
|
||||||
m_presences.TryGetValue(AgentID, out userPresence);
|
m_presences.TryGetValue(AgentID, out userPresence);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (userPresence != null) // found the user
|
if (userPresence != null) // found the user
|
||||||
{
|
{
|
||||||
List<UUID> AgentsNeedingNotification = userPresence.subscriptionData;
|
List<UUID> AgentsNeedingNotification = userPresence.subscriptionData;
|
||||||
userPresence.OnlineYN = false;
|
userPresence.OnlineYN = false;
|
||||||
|
|
||||||
for (int i = 0; i < AgentsNeedingNotification.Count; i++)
|
for (int i = 0; i < AgentsNeedingNotification.Count; i++)
|
||||||
{
|
{
|
||||||
UserPresenceData friendPresence = null;
|
UserPresenceData friendPresence = null;
|
||||||
lock (m_presences)
|
lock (m_presences)
|
||||||
{
|
{
|
||||||
m_presences.TryGetValue(AgentsNeedingNotification[i], out friendPresence);
|
m_presences.TryGetValue(AgentsNeedingNotification[i], out friendPresence);
|
||||||
}
|
}
|
||||||
|
|
||||||
// This might need to be enumerated and checked before we try to remove it.
|
// This might need to be enumerated and checked before we try to remove it.
|
||||||
if (friendPresence != null)
|
if (friendPresence != null)
|
||||||
{
|
{
|
||||||
lock (friendPresence)
|
lock (friendPresence)
|
||||||
{
|
{
|
||||||
// no updates for this user anymore
|
// no updates for this user anymore
|
||||||
friendPresence.subscriptionData.Remove(AgentID);
|
friendPresence.subscriptionData.Remove(AgentID);
|
||||||
|
|
||||||
// set user's entry in the friend's list to offline (if it exists)
|
// set user's entry in the friend's list to offline (if it exists)
|
||||||
if (friendPresence.friendData.ContainsKey(AgentID))
|
if (friendPresence.friendData.ContainsKey(AgentID))
|
||||||
{
|
{
|
||||||
friendPresence.friendData[AgentID].onlinestatus = false;
|
friendPresence.friendData[AgentID].onlinestatus = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
enqueuePresenceUpdate(userPresence, friendPresence);
|
enqueuePresenceUpdate(userPresence, friendPresence);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
private void PresenceUpdateDone(PresenceInformer obj)
|
private void PresenceUpdateDone(PresenceInformer obj)
|
||||||
{
|
{
|
||||||
obj.OnGetRegionData -= m_regionModule.GetRegionInfo;
|
obj.OnGetRegionData -= m_regionModule.GetRegionInfo;
|
||||||
obj.OnDone -= PresenceUpdateDone;
|
obj.OnDone -= PresenceUpdateDone;
|
||||||
}
|
}
|
||||||
|
|
||||||
#region UserServer Comms
|
#region UserServer Comms
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Returns a list of FriendsListItems that describe the friends and permissions in the friend
|
/// Returns a list of FriendsListItems that describe the friends and permissions in the friend
|
||||||
/// relationship for UUID friendslistowner. For faster lookup, we index by friend's UUID.
|
/// relationship for UUID friendslistowner. For faster lookup, we index by friend's UUID.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="friendlistowner">The agent that we're retreiving the friends Data for.</param>
|
/// <param name="friendlistowner">The agent that we're retreiving the friends Data for.</param>
|
||||||
private Dictionary<UUID, FriendListItem> GetUserFriendList(UUID friendlistowner)
|
private Dictionary<UUID, FriendListItem> GetUserFriendList(UUID friendlistowner)
|
||||||
{
|
{
|
||||||
Dictionary<UUID, FriendListItem> buddies = new Dictionary<UUID,FriendListItem>();
|
Dictionary<UUID, FriendListItem> buddies = new Dictionary<UUID,FriendListItem>();
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Hashtable param = new Hashtable();
|
Hashtable param = new Hashtable();
|
||||||
param["ownerID"] = friendlistowner.ToString();
|
param["ownerID"] = friendlistowner.ToString();
|
||||||
|
|
||||||
IList parameters = new ArrayList();
|
IList parameters = new ArrayList();
|
||||||
parameters.Add(param);
|
parameters.Add(param);
|
||||||
XmlRpcRequest req = new XmlRpcRequest("get_user_friend_list", parameters);
|
XmlRpcRequest req = new XmlRpcRequest("get_user_friend_list", parameters);
|
||||||
XmlRpcResponse resp = req.Send(m_cfg.UserServerURL, 3000);
|
XmlRpcResponse resp = req.Send(m_cfg.UserServerURL, 3000);
|
||||||
Hashtable respData = (Hashtable)resp.Value;
|
Hashtable respData = (Hashtable)resp.Value;
|
||||||
|
|
||||||
if (respData.Contains("avcount"))
|
if (respData.Contains("avcount"))
|
||||||
{
|
{
|
||||||
buddies = ConvertXMLRPCDataToFriendListItemList(respData);
|
buddies = ConvertXMLRPCDataToFriendListItemList(respData);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
catch (WebException e)
|
catch (WebException e)
|
||||||
{
|
{
|
||||||
m_log.Warn("Error when trying to fetch Avatar's friends list: " +
|
m_log.Warn("Error when trying to fetch Avatar's friends list: " +
|
||||||
e.Message);
|
e.Message);
|
||||||
// Return Empty list (no friends)
|
// Return Empty list (no friends)
|
||||||
}
|
}
|
||||||
return buddies;
|
return buddies;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Converts XMLRPC Friend List to FriendListItem Object
|
/// Converts XMLRPC Friend List to FriendListItem Object
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="data">XMLRPC response data Hashtable</param>
|
/// <param name="data">XMLRPC response data Hashtable</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public Dictionary<UUID, FriendListItem> ConvertXMLRPCDataToFriendListItemList(Hashtable data)
|
public Dictionary<UUID, FriendListItem> ConvertXMLRPCDataToFriendListItemList(Hashtable data)
|
||||||
{
|
{
|
||||||
Dictionary<UUID, FriendListItem> buddies = new Dictionary<UUID,FriendListItem>();
|
Dictionary<UUID, FriendListItem> buddies = new Dictionary<UUID,FriendListItem>();
|
||||||
int buddycount = Convert.ToInt32((string)data["avcount"]);
|
int buddycount = Convert.ToInt32((string)data["avcount"]);
|
||||||
|
|
||||||
for (int i = 0; i < buddycount; i++)
|
for (int i = 0; i < buddycount; i++)
|
||||||
{
|
{
|
||||||
FriendListItem buddylistitem = new FriendListItem();
|
FriendListItem buddylistitem = new FriendListItem();
|
||||||
|
|
||||||
buddylistitem.FriendListOwner = new UUID((string)data["ownerID" + i.ToString()]);
|
buddylistitem.FriendListOwner = new UUID((string)data["ownerID" + i.ToString()]);
|
||||||
buddylistitem.Friend = new UUID((string)data["friendID" + i.ToString()]);
|
buddylistitem.Friend = new UUID((string)data["friendID" + i.ToString()]);
|
||||||
buddylistitem.FriendListOwnerPerms = (uint)Convert.ToInt32((string)data["ownerPerms" + i.ToString()]);
|
buddylistitem.FriendListOwnerPerms = (uint)Convert.ToInt32((string)data["ownerPerms" + i.ToString()]);
|
||||||
buddylistitem.FriendPerms = (uint)Convert.ToInt32((string)data["friendPerms" + i.ToString()]);
|
buddylistitem.FriendPerms = (uint)Convert.ToInt32((string)data["friendPerms" + i.ToString()]);
|
||||||
|
|
||||||
buddies.Add(buddylistitem.Friend, buddylistitem);
|
buddies.Add(buddylistitem.Friend, buddylistitem);
|
||||||
}
|
}
|
||||||
|
|
||||||
return buddies;
|
return buddies;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// UserServer sends an expect_user method
|
/// UserServer sends an expect_user method
|
||||||
/// this handles the method and provisions the
|
/// this handles the method and provisions the
|
||||||
/// necessary info for presence to work
|
/// necessary info for presence to work
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="request">UserServer Data</param>
|
/// <param name="request">UserServer Data</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public XmlRpcResponse UserLoggedOn(XmlRpcRequest request)
|
public XmlRpcResponse UserLoggedOn(XmlRpcRequest request)
|
||||||
{
|
{
|
||||||
Hashtable requestData = (Hashtable)request.Params[0];
|
Hashtable requestData = (Hashtable)request.Params[0];
|
||||||
|
|
||||||
AgentCircuitData agentData = new AgentCircuitData();
|
AgentCircuitData agentData = new AgentCircuitData();
|
||||||
agentData.SessionID = new UUID((string)requestData["sessionid"]);
|
agentData.SessionID = new UUID((string)requestData["sessionid"]);
|
||||||
agentData.SecureSessionID = new UUID((string)requestData["secure_session_id"]);
|
agentData.SecureSessionID = new UUID((string)requestData["secure_session_id"]);
|
||||||
agentData.firstname = (string)requestData["firstname"];
|
agentData.firstname = (string)requestData["firstname"];
|
||||||
agentData.lastname = (string)requestData["lastname"];
|
agentData.lastname = (string)requestData["lastname"];
|
||||||
agentData.AgentID = new UUID((string)requestData["agentid"]);
|
agentData.AgentID = new UUID((string)requestData["agentid"]);
|
||||||
agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
|
agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
|
||||||
agentData.CapsPath = (string)requestData["caps_path"];
|
agentData.CapsPath = (string)requestData["caps_path"];
|
||||||
|
|
||||||
if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
|
if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
|
||||||
{
|
{
|
||||||
agentData.child = true;
|
agentData.child = true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
agentData.startpos =
|
agentData.startpos =
|
||||||
new Vector3(Convert.ToSingle(requestData["positionx"]),
|
new Vector3(Convert.ToSingle(requestData["positionx"]),
|
||||||
Convert.ToSingle(requestData["positiony"]),
|
Convert.ToSingle(requestData["positiony"]),
|
||||||
Convert.ToSingle(requestData["positionz"]));
|
Convert.ToSingle(requestData["positionz"]));
|
||||||
agentData.child = false;
|
agentData.child = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]);
|
ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]);
|
||||||
|
|
||||||
m_log.InfoFormat("[LOGON]: User {0} {1} logged into region {2} as {3} agent, building indexes for user",
|
m_log.InfoFormat("[LOGON]: User {0} {1} logged into region {2} as {3} agent, building indexes for user",
|
||||||
agentData.firstname, agentData.lastname, regionHandle, agentData.child ? "child" : "root");
|
agentData.firstname, agentData.lastname, regionHandle, agentData.child ? "child" : "root");
|
||||||
|
|
||||||
UserPresenceData up = new UserPresenceData();
|
UserPresenceData up = new UserPresenceData();
|
||||||
up.agentData = agentData;
|
up.agentData = agentData;
|
||||||
up.friendData = GetUserFriendList(agentData.AgentID);
|
up.friendData = GetUserFriendList(agentData.AgentID);
|
||||||
up.regionData = m_regionModule.GetRegionInfo(regionHandle);
|
up.regionData = m_regionModule.GetRegionInfo(regionHandle);
|
||||||
up.OnlineYN = true;
|
up.OnlineYN = true;
|
||||||
up.lookupUserRegionYN = false;
|
up.lookupUserRegionYN = false;
|
||||||
ProcessFriendListSubscriptions(up);
|
ProcessFriendListSubscriptions(up);
|
||||||
|
|
||||||
return new XmlRpcResponse();
|
return new XmlRpcResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The UserServer got a Logoff message
|
/// The UserServer got a Logoff message
|
||||||
/// Cleanup time for that user. Send out presence notifications
|
/// Cleanup time for that user. Send out presence notifications
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="request"></param>
|
/// <param name="request"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public XmlRpcResponse UserLoggedOff(XmlRpcRequest request)
|
public XmlRpcResponse UserLoggedOff(XmlRpcRequest request)
|
||||||
{
|
{
|
||||||
m_log.Info("[USERLOGOFF]: User logged off called");
|
m_log.Info("[USERLOGOFF]: User logged off called");
|
||||||
Hashtable requestData = (Hashtable)request.Params[0];
|
Hashtable requestData = (Hashtable)request.Params[0];
|
||||||
|
|
||||||
UUID AgentID = new UUID((string)requestData["agentid"]);
|
UUID AgentID = new UUID((string)requestData["agentid"]);
|
||||||
ProcessLogOff(AgentID);
|
ProcessLogOff(AgentID);
|
||||||
|
|
||||||
return new XmlRpcResponse();
|
return new XmlRpcResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
public XmlRpcResponse GetPresenceInfoBulk(XmlRpcRequest request)
|
public XmlRpcResponse GetPresenceInfoBulk(XmlRpcRequest request)
|
||||||
{
|
{
|
||||||
Hashtable paramHash = (Hashtable)request.Params[0];
|
Hashtable paramHash = (Hashtable)request.Params[0];
|
||||||
Hashtable result = new Hashtable();
|
Hashtable result = new Hashtable();
|
||||||
|
|
||||||
// TODO check access (recv_key/send_key)
|
// TODO check access (recv_key/send_key)
|
||||||
|
|
||||||
IList list = (IList)paramHash["uuids"];
|
IList list = (IList)paramHash["uuids"];
|
||||||
|
|
||||||
// convert into List<UUID>
|
// convert into List<UUID>
|
||||||
List<UUID> uuids = new List<UUID>();
|
List<UUID> uuids = new List<UUID>();
|
||||||
for (int i = 0; i < list.Count; ++i)
|
for (int i = 0; i < list.Count; ++i)
|
||||||
{
|
{
|
||||||
UUID uuid;
|
UUID uuid;
|
||||||
if (UUID.TryParse((string)list[i], out uuid))
|
if (UUID.TryParse((string)list[i], out uuid))
|
||||||
{
|
{
|
||||||
uuids.Add(uuid);
|
uuids.Add(uuid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Dictionary<UUID, FriendRegionInfo> infos = m_userDataBaseService.GetFriendRegionInfos(uuids);
|
Dictionary<UUID, FriendRegionInfo> infos = m_userDataBaseService.GetFriendRegionInfos(uuids);
|
||||||
m_log.DebugFormat("[FRIEND]: Got {0} region entries back.", infos.Count);
|
m_log.DebugFormat("[FRIEND]: Got {0} region entries back.", infos.Count);
|
||||||
int count = 0;
|
int count = 0;
|
||||||
foreach (KeyValuePair<UUID, FriendRegionInfo> pair in infos)
|
foreach (KeyValuePair<UUID, FriendRegionInfo> pair in infos)
|
||||||
{
|
{
|
||||||
result["uuid_" + count] = pair.Key.ToString();
|
result["uuid_" + count] = pair.Key.ToString();
|
||||||
result["isOnline_" + count] = pair.Value.isOnline;
|
result["isOnline_" + count] = pair.Value.isOnline;
|
||||||
result["regionHandle_" + count] = pair.Value.regionHandle.ToString(); // XML-RPC doesn't know ulongs
|
result["regionHandle_" + count] = pair.Value.regionHandle.ToString(); // XML-RPC doesn't know ulongs
|
||||||
++count;
|
++count;
|
||||||
}
|
}
|
||||||
result["count"] = count;
|
result["count"] = count;
|
||||||
|
|
||||||
XmlRpcResponse response = new XmlRpcResponse();
|
XmlRpcResponse response = new XmlRpcResponse();
|
||||||
response.Value = result;
|
response.Value = result;
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
catch(Exception e) {
|
catch(Exception e) {
|
||||||
m_log.Error("Got exception:", e);
|
m_log.Error("Got exception:", e);
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public XmlRpcResponse AgentLocation(XmlRpcRequest request)
|
public XmlRpcResponse AgentLocation(XmlRpcRequest request)
|
||||||
{
|
{
|
||||||
Hashtable requestData = (Hashtable)request.Params[0];
|
Hashtable requestData = (Hashtable)request.Params[0];
|
||||||
Hashtable result = new Hashtable();
|
Hashtable result = new Hashtable();
|
||||||
result["success"] = "FALSE";
|
result["success"] = "FALSE";
|
||||||
|
|
||||||
if (m_userServerModule.SendToUserServer(requestData, "agent_location"))
|
if (m_userServerModule.SendToUserServer(requestData, "agent_location"))
|
||||||
result["success"] = "TRUE";
|
result["success"] = "TRUE";
|
||||||
|
|
||||||
|
|
||||||
XmlRpcResponse response = new XmlRpcResponse();
|
XmlRpcResponse response = new XmlRpcResponse();
|
||||||
response.Value = result;
|
response.Value = result;
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
public XmlRpcResponse AgentLeaving(XmlRpcRequest request)
|
public XmlRpcResponse AgentLeaving(XmlRpcRequest request)
|
||||||
{
|
{
|
||||||
Hashtable requestData = (Hashtable)request.Params[0];
|
Hashtable requestData = (Hashtable)request.Params[0];
|
||||||
Hashtable result = new Hashtable();
|
Hashtable result = new Hashtable();
|
||||||
result["success"] = "FALSE";
|
result["success"] = "FALSE";
|
||||||
|
|
||||||
if (m_userServerModule.SendToUserServer(requestData, "agent_leaving"))
|
if (m_userServerModule.SendToUserServer(requestData, "agent_leaving"))
|
||||||
result["success"] = "TRUE";
|
result["success"] = "TRUE";
|
||||||
|
|
||||||
XmlRpcResponse response = new XmlRpcResponse();
|
XmlRpcResponse response = new XmlRpcResponse();
|
||||||
response.Value = result;
|
response.Value = result;
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
public XmlRpcResponse ProcessRegionShutdown(XmlRpcRequest request)
|
public XmlRpcResponse ProcessRegionShutdown(XmlRpcRequest request)
|
||||||
{
|
{
|
||||||
Hashtable requestData = (Hashtable)request.Params[0];
|
Hashtable requestData = (Hashtable)request.Params[0];
|
||||||
Hashtable result = new Hashtable();
|
Hashtable result = new Hashtable();
|
||||||
result["success"] = "FALSE";
|
result["success"] = "FALSE";
|
||||||
|
|
||||||
UUID regionID;
|
UUID regionID;
|
||||||
if (UUID.TryParse((string)requestData["regionid"], out regionID))
|
if (UUID.TryParse((string)requestData["regionid"], out regionID))
|
||||||
{
|
{
|
||||||
m_log.DebugFormat("[PRESENCE] Processing region restart for {0}", regionID);
|
m_log.DebugFormat("[PRESENCE] Processing region restart for {0}", regionID);
|
||||||
result["success"] = "TRUE";
|
result["success"] = "TRUE";
|
||||||
|
|
||||||
foreach (UserPresenceData up in m_presences.Values)
|
foreach (UserPresenceData up in m_presences.Values)
|
||||||
{
|
{
|
||||||
if (up.regionData.UUID == regionID)
|
if (up.regionData.UUID == regionID)
|
||||||
{
|
{
|
||||||
if (up.OnlineYN)
|
if (up.OnlineYN)
|
||||||
{
|
{
|
||||||
m_log.DebugFormat("[PRESENCE] Logging off {0} because the region they were in has gone", up.agentData.AgentID);
|
m_log.DebugFormat("[PRESENCE] Logging off {0} because the region they were in has gone", up.agentData.AgentID);
|
||||||
ProcessLogOff(up.agentData.AgentID);
|
ProcessLogOff(up.agentData.AgentID);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
XmlRpcResponse response = new XmlRpcResponse();
|
XmlRpcResponse response = new XmlRpcResponse();
|
||||||
response.Value = result;
|
response.Value = result;
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,186 +1,186 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
* * Redistributions of source code must retain the above copyright
|
* * Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* * Neither the name of the OpenSim Project nor the
|
* * Neither the name of the OpenSim Project nor the
|
||||||
* names of its contributors may be used to endorse or promote products
|
* names of its contributors may be used to endorse or promote products
|
||||||
* derived from this software without specific prior written permission.
|
* derived from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* 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
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Timers;
|
using System.Timers;
|
||||||
using log4net;
|
using log4net;
|
||||||
using Nwc.XmlRpc;
|
using Nwc.XmlRpc;
|
||||||
using OpenMetaverse;
|
using OpenMetaverse;
|
||||||
using OpenSim.Data;
|
using OpenSim.Data;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
using OpenSim.Grid.Framework;
|
using OpenSim.Grid.Framework;
|
||||||
using Timer = System.Timers.Timer;
|
using Timer = System.Timers.Timer;
|
||||||
|
|
||||||
namespace OpenSim.Grid.MessagingServer
|
namespace OpenSim.Grid.MessagingServer.Modules
|
||||||
{
|
{
|
||||||
public class MessageUserServerModule : IMessageUserServerService
|
public class MessageUserServerModule : IMessageUserServerService
|
||||||
{
|
{
|
||||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
private MessageServerConfig m_cfg;
|
private MessageServerConfig m_cfg;
|
||||||
|
|
||||||
private IUGAIMCore m_messageCore;
|
private IUGAIMCore m_messageCore;
|
||||||
|
|
||||||
private Timer reconnectTimer = new Timer(300000); // 5 mins
|
private Timer reconnectTimer = new Timer(300000); // 5 mins
|
||||||
|
|
||||||
public MessageUserServerModule(MessageServerConfig config, IUGAIMCore messageCore)
|
public MessageUserServerModule(MessageServerConfig config, IUGAIMCore messageCore)
|
||||||
{
|
{
|
||||||
m_cfg = config;
|
m_cfg = config;
|
||||||
m_messageCore = messageCore;
|
m_messageCore = messageCore;
|
||||||
|
|
||||||
reconnectTimer.Elapsed += registerWithUserServer;
|
reconnectTimer.Elapsed += registerWithUserServer;
|
||||||
reconnectTimer.Start();
|
reconnectTimer.Start();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Initialise()
|
public void Initialise()
|
||||||
{
|
{
|
||||||
m_messageCore.RegisterInterface<IMessageUserServerService>(this);
|
m_messageCore.RegisterInterface<IMessageUserServerService>(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void PostInitialise()
|
public void PostInitialise()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RegisterHandlers()
|
public void RegisterHandlers()
|
||||||
{
|
{
|
||||||
//have these in separate method as some servers restart the http server and reregister all the handlers.
|
//have these in separate method as some servers restart the http server and reregister all the handlers.
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void registerWithUserServer(object sender, ElapsedEventArgs e)
|
public void registerWithUserServer(object sender, ElapsedEventArgs e)
|
||||||
{
|
{
|
||||||
registerWithUserServer();
|
registerWithUserServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool registerWithUserServer()
|
public bool registerWithUserServer()
|
||||||
{
|
{
|
||||||
Hashtable UserParams = new Hashtable();
|
Hashtable UserParams = new Hashtable();
|
||||||
// Login / Authentication
|
// Login / Authentication
|
||||||
|
|
||||||
if (m_cfg.HttpSSL)
|
if (m_cfg.HttpSSL)
|
||||||
{
|
{
|
||||||
UserParams["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
|
UserParams["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
UserParams["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
|
UserParams["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
|
||||||
}
|
}
|
||||||
|
|
||||||
UserParams["recvkey"] = m_cfg.UserRecvKey;
|
UserParams["recvkey"] = m_cfg.UserRecvKey;
|
||||||
UserParams["sendkey"] = m_cfg.UserRecvKey;
|
UserParams["sendkey"] = m_cfg.UserRecvKey;
|
||||||
|
|
||||||
// Package into an XMLRPC Request
|
// Package into an XMLRPC Request
|
||||||
ArrayList SendParams = new ArrayList();
|
ArrayList SendParams = new ArrayList();
|
||||||
SendParams.Add(UserParams);
|
SendParams.Add(UserParams);
|
||||||
|
|
||||||
bool success = true;
|
bool success = true;
|
||||||
string[] servers = m_cfg.UserServerURL.Split(' ');
|
string[] servers = m_cfg.UserServerURL.Split(' ');
|
||||||
|
|
||||||
foreach (string srv in servers)
|
foreach (string srv in servers)
|
||||||
{
|
{
|
||||||
// Send Request
|
// Send Request
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
XmlRpcRequest UserReq = new XmlRpcRequest("register_messageserver", SendParams);
|
XmlRpcRequest UserReq = new XmlRpcRequest("register_messageserver", SendParams);
|
||||||
XmlRpcResponse UserResp = UserReq.Send(srv, 16000);
|
XmlRpcResponse UserResp = UserReq.Send(srv, 16000);
|
||||||
|
|
||||||
// Process Response
|
// Process Response
|
||||||
Hashtable GridRespData = (Hashtable)UserResp.Value;
|
Hashtable GridRespData = (Hashtable)UserResp.Value;
|
||||||
// if we got a response, we were successful
|
// if we got a response, we were successful
|
||||||
if (!GridRespData.ContainsKey("responsestring"))
|
if (!GridRespData.ContainsKey("responsestring"))
|
||||||
success = false;
|
success = false;
|
||||||
else
|
else
|
||||||
m_log.InfoFormat("[SERVER] Registered with {0}", srv);
|
m_log.InfoFormat("[SERVER] Registered with {0}", srv);
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv);
|
m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv);
|
||||||
success = false;
|
success = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return success;
|
return success;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool deregisterWithUserServer()
|
public bool deregisterWithUserServer()
|
||||||
{
|
{
|
||||||
Hashtable request = new Hashtable();
|
Hashtable request = new Hashtable();
|
||||||
|
|
||||||
return SendToUserServer(request, "deregister_messageserver");
|
return SendToUserServer(request, "deregister_messageserver");
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool SendToUserServer(Hashtable request, string method)
|
public bool SendToUserServer(Hashtable request, string method)
|
||||||
{
|
{
|
||||||
// Login / Authentication
|
// Login / Authentication
|
||||||
|
|
||||||
if (m_cfg.HttpSSL)
|
if (m_cfg.HttpSSL)
|
||||||
{
|
{
|
||||||
request["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
|
request["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
request["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
|
request["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
|
||||||
}
|
}
|
||||||
|
|
||||||
request["recvkey"] = m_cfg.UserRecvKey;
|
request["recvkey"] = m_cfg.UserRecvKey;
|
||||||
request["sendkey"] = m_cfg.UserRecvKey;
|
request["sendkey"] = m_cfg.UserRecvKey;
|
||||||
|
|
||||||
// Package into an XMLRPC Request
|
// Package into an XMLRPC Request
|
||||||
ArrayList SendParams = new ArrayList();
|
ArrayList SendParams = new ArrayList();
|
||||||
SendParams.Add(request);
|
SendParams.Add(request);
|
||||||
|
|
||||||
bool success = true;
|
bool success = true;
|
||||||
string[] servers = m_cfg.UserServerURL.Split(' ');
|
string[] servers = m_cfg.UserServerURL.Split(' ');
|
||||||
|
|
||||||
// Send Request
|
// Send Request
|
||||||
foreach (string srv in servers)
|
foreach (string srv in servers)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
XmlRpcRequest UserReq = new XmlRpcRequest(method, SendParams);
|
XmlRpcRequest UserReq = new XmlRpcRequest(method, SendParams);
|
||||||
XmlRpcResponse UserResp = UserReq.Send(m_cfg.UserServerURL, 16000);
|
XmlRpcResponse UserResp = UserReq.Send(m_cfg.UserServerURL, 16000);
|
||||||
// Process Response
|
// Process Response
|
||||||
Hashtable UserRespData = (Hashtable)UserResp.Value;
|
Hashtable UserRespData = (Hashtable)UserResp.Value;
|
||||||
// if we got a response, we were successful
|
// if we got a response, we were successful
|
||||||
if (!UserRespData.ContainsKey("responsestring"))
|
if (!UserRespData.ContainsKey("responsestring"))
|
||||||
success = false;
|
success = false;
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv);
|
m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv);
|
||||||
success = false;
|
success = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return success;
|
return success;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,96 +1,96 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
* * Redistributions of source code must retain the above copyright
|
* * Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* * Neither the name of the OpenSim Project nor the
|
* * Neither the name of the OpenSim Project nor the
|
||||||
* names of its contributors may be used to endorse or promote products
|
* names of its contributors may be used to endorse or promote products
|
||||||
* derived from this software without specific prior written permission.
|
* derived from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* 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
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using OpenMetaverse;
|
using OpenMetaverse;
|
||||||
|
|
||||||
namespace OpenSim.Grid.MessagingServer
|
namespace OpenSim.Grid.MessagingServer.Modules
|
||||||
{
|
{
|
||||||
// This is a wrapper for a List<UUID> so it can be happily stored in a hashtable.
|
// This is a wrapper for a List<UUID> so it can be happily stored in a hashtable.
|
||||||
public class PresenceBackreferenceEntry
|
public class PresenceBackreferenceEntry
|
||||||
{
|
{
|
||||||
List<UUID> AgentList = new List<UUID>();
|
List<UUID> AgentList = new List<UUID>();
|
||||||
|
|
||||||
public PresenceBackreferenceEntry()
|
public PresenceBackreferenceEntry()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Add(UUID item)
|
public void Add(UUID item)
|
||||||
{
|
{
|
||||||
lock (AgentList)
|
lock (AgentList)
|
||||||
{
|
{
|
||||||
AgentList.Add(item);
|
AgentList.Add(item);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public UUID getitem(int index)
|
public UUID getitem(int index)
|
||||||
{
|
{
|
||||||
UUID result = UUID.Zero;
|
UUID result = UUID.Zero;
|
||||||
lock (AgentList)
|
lock (AgentList)
|
||||||
{
|
{
|
||||||
if (index > 0 && index < AgentList.Count)
|
if (index > 0 && index < AgentList.Count)
|
||||||
{
|
{
|
||||||
result = AgentList[index];
|
result = AgentList[index];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int Count
|
public int Count
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
int count = 0;
|
int count = 0;
|
||||||
lock (AgentList)
|
lock (AgentList)
|
||||||
{
|
{
|
||||||
count = AgentList.Count;
|
count = AgentList.Count;
|
||||||
}
|
}
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Remove(UUID item)
|
public void Remove(UUID item)
|
||||||
{
|
{
|
||||||
lock (AgentList)
|
lock (AgentList)
|
||||||
{
|
{
|
||||||
if (AgentList.Contains(item))
|
if (AgentList.Contains(item))
|
||||||
AgentList.Remove(item);
|
AgentList.Remove(item);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool contains(UUID item)
|
public bool contains(UUID item)
|
||||||
{
|
{
|
||||||
bool result = false;
|
bool result = false;
|
||||||
lock (AgentList)
|
lock (AgentList)
|
||||||
{
|
{
|
||||||
result = AgentList.Contains(item);
|
result = AgentList.Contains(item);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,135 +1,135 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
* * Redistributions of source code must retain the above copyright
|
* * Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* * Neither the name of the OpenSim Project nor the
|
* * Neither the name of the OpenSim Project nor the
|
||||||
* names of its contributors may be used to endorse or promote products
|
* names of its contributors may be used to endorse or promote products
|
||||||
* derived from this software without specific prior written permission.
|
* derived from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* 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
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using log4net;
|
using log4net;
|
||||||
using Nwc.XmlRpc;
|
using Nwc.XmlRpc;
|
||||||
using OpenSim.Data;
|
using OpenSim.Data;
|
||||||
|
|
||||||
namespace OpenSim.Grid.MessagingServer
|
namespace OpenSim.Grid.MessagingServer.Modules
|
||||||
{
|
{
|
||||||
public delegate RegionProfileData GetRegionData(ulong region_handle);
|
public delegate RegionProfileData GetRegionData(ulong region_handle);
|
||||||
public delegate void Done(PresenceInformer obj);
|
public delegate void Done(PresenceInformer obj);
|
||||||
|
|
||||||
|
|
||||||
public class PresenceInformer
|
public class PresenceInformer
|
||||||
{
|
{
|
||||||
public event GetRegionData OnGetRegionData;
|
public event GetRegionData OnGetRegionData;
|
||||||
public event Done OnDone;
|
public event Done OnDone;
|
||||||
|
|
||||||
private GetRegionData handlerGetRegionData = null;
|
private GetRegionData handlerGetRegionData = null;
|
||||||
private Done handlerDone = null;
|
private Done handlerDone = null;
|
||||||
|
|
||||||
public UserPresenceData presence1 = null;
|
public UserPresenceData presence1 = null;
|
||||||
public UserPresenceData presence2 = null;
|
public UserPresenceData presence2 = null;
|
||||||
public string gridserverurl, gridserversendkey, gridserverrecvkey;
|
public string gridserverurl, gridserversendkey, gridserverrecvkey;
|
||||||
public bool lookupRegion = true;
|
public bool lookupRegion = true;
|
||||||
//public methodGroup
|
//public methodGroup
|
||||||
|
|
||||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
public PresenceInformer()
|
public PresenceInformer()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
public void go(object o)
|
public void go(object o)
|
||||||
{
|
{
|
||||||
if (presence1 != null && presence2 != null)
|
if (presence1 != null && presence2 != null)
|
||||||
{
|
{
|
||||||
SendRegionPresenceUpdate(presence1, presence2);
|
SendRegionPresenceUpdate(presence1, presence2);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Informs a region about an Agent
|
/// Informs a region about an Agent
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="TalkingAbout">User to talk about</param>
|
/// <param name="TalkingAbout">User to talk about</param>
|
||||||
/// <param name="UserToUpdate">User we're sending this too (contains the region)</param>
|
/// <param name="UserToUpdate">User we're sending this too (contains the region)</param>
|
||||||
public void SendRegionPresenceUpdate(UserPresenceData TalkingAbout, UserPresenceData UserToUpdate)
|
public void SendRegionPresenceUpdate(UserPresenceData TalkingAbout, UserPresenceData UserToUpdate)
|
||||||
{
|
{
|
||||||
// TODO: Fill in pertenant Presence Data from 'TalkingAbout'
|
// TODO: Fill in pertenant Presence Data from 'TalkingAbout'
|
||||||
RegionProfileData whichRegion = new RegionProfileData();
|
RegionProfileData whichRegion = new RegionProfileData();
|
||||||
if (lookupRegion)
|
if (lookupRegion)
|
||||||
{
|
{
|
||||||
handlerGetRegionData = OnGetRegionData;
|
handlerGetRegionData = OnGetRegionData;
|
||||||
if (handlerGetRegionData != null)
|
if (handlerGetRegionData != null)
|
||||||
{
|
{
|
||||||
whichRegion = handlerGetRegionData(UserToUpdate.regionData.regionHandle);
|
whichRegion = handlerGetRegionData(UserToUpdate.regionData.regionHandle);
|
||||||
}
|
}
|
||||||
//RegionProfileData rp = RegionProfileData.RequestSimProfileData(UserToUpdate.regionData.regionHandle, gridserverurl, gridserversendkey, gridserverrecvkey);
|
//RegionProfileData rp = RegionProfileData.RequestSimProfileData(UserToUpdate.regionData.regionHandle, gridserverurl, gridserversendkey, gridserverrecvkey);
|
||||||
|
|
||||||
//whichRegion = rp;
|
//whichRegion = rp;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
whichRegion = UserToUpdate.regionData;
|
whichRegion = UserToUpdate.regionData;
|
||||||
}
|
}
|
||||||
//whichRegion.httpServerURI
|
//whichRegion.httpServerURI
|
||||||
|
|
||||||
if (whichRegion != null)
|
if (whichRegion != null)
|
||||||
{
|
{
|
||||||
Hashtable PresenceParams = new Hashtable();
|
Hashtable PresenceParams = new Hashtable();
|
||||||
PresenceParams.Add("agent_id",TalkingAbout.agentData.AgentID.ToString());
|
PresenceParams.Add("agent_id",TalkingAbout.agentData.AgentID.ToString());
|
||||||
PresenceParams.Add("notify_id",UserToUpdate.agentData.AgentID.ToString());
|
PresenceParams.Add("notify_id",UserToUpdate.agentData.AgentID.ToString());
|
||||||
if (TalkingAbout.OnlineYN)
|
if (TalkingAbout.OnlineYN)
|
||||||
PresenceParams.Add("status","TRUE");
|
PresenceParams.Add("status","TRUE");
|
||||||
else
|
else
|
||||||
PresenceParams.Add("status","FALSE");
|
PresenceParams.Add("status","FALSE");
|
||||||
|
|
||||||
ArrayList SendParams = new ArrayList();
|
ArrayList SendParams = new ArrayList();
|
||||||
SendParams.Add(PresenceParams);
|
SendParams.Add(PresenceParams);
|
||||||
|
|
||||||
m_log.InfoFormat("[PRESENCE]: Informing {0}@{1} at {2} about {3}", TalkingAbout.agentData.firstname + " " + TalkingAbout.agentData.lastname, whichRegion.regionName, whichRegion.httpServerURI, UserToUpdate.agentData.firstname + " " + UserToUpdate.agentData.lastname);
|
m_log.InfoFormat("[PRESENCE]: Informing {0}@{1} at {2} about {3}", TalkingAbout.agentData.firstname + " " + TalkingAbout.agentData.lastname, whichRegion.regionName, whichRegion.httpServerURI, UserToUpdate.agentData.firstname + " " + UserToUpdate.agentData.lastname);
|
||||||
// Send
|
// Send
|
||||||
XmlRpcRequest RegionReq = new XmlRpcRequest("presence_update", SendParams);
|
XmlRpcRequest RegionReq = new XmlRpcRequest("presence_update", SendParams);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
// XmlRpcResponse RegionResp = RegionReq.Send(whichRegion.httpServerURI, 6000);
|
// XmlRpcResponse RegionResp = RegionReq.Send(whichRegion.httpServerURI, 6000);
|
||||||
RegionReq.Send(whichRegion.httpServerURI, 6000);
|
RegionReq.Send(whichRegion.httpServerURI, 6000);
|
||||||
}
|
}
|
||||||
catch (WebException)
|
catch (WebException)
|
||||||
{
|
{
|
||||||
m_log.WarnFormat("[INFORM]: failed notifying region {0} containing user {1} about {2}", whichRegion.regionName, UserToUpdate.agentData.firstname + " " + UserToUpdate.agentData.lastname, TalkingAbout.agentData.firstname + " " + TalkingAbout.agentData.lastname);
|
m_log.WarnFormat("[INFORM]: failed notifying region {0} containing user {1} about {2}", whichRegion.regionName, UserToUpdate.agentData.firstname + " " + UserToUpdate.agentData.lastname, TalkingAbout.agentData.firstname + " " + TalkingAbout.agentData.lastname);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_log.Info("[PRESENCEUPDATER]: Region data was null skipping");
|
m_log.Info("[PRESENCEUPDATER]: Region data was null skipping");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
handlerDone = OnDone;
|
handlerDone = OnDone;
|
||||||
if (handlerDone != null)
|
if (handlerDone != null)
|
||||||
{
|
{
|
||||||
handlerDone(this);
|
handlerDone(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,33 +1,33 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
* * Redistributions of source code must retain the above copyright
|
* * Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* * Neither the name of the OpenSim Project nor the
|
* * Neither the name of the OpenSim Project nor the
|
||||||
* names of its contributors may be used to endorse or promote products
|
* names of its contributors may be used to endorse or promote products
|
||||||
* derived from this software without specific prior written permission.
|
* derived from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* 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
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OpenSim.Grid.MessagingServer
|
namespace OpenSim.Grid.MessagingServer.Modules
|
||||||
{
|
{
|
||||||
class PresenceService
|
class PresenceService
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,75 +1,75 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
* * Redistributions of source code must retain the above copyright
|
* * Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* * Neither the name of the OpenSim Project nor the
|
* * Neither the name of the OpenSim Project nor the
|
||||||
* names of its contributors may be used to endorse or promote products
|
* names of its contributors may be used to endorse or promote products
|
||||||
* derived from this software without specific prior written permission.
|
* derived from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* 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
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using OpenMetaverse;
|
using OpenMetaverse;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
using OpenSim.Framework.Communications;
|
using OpenSim.Framework.Communications;
|
||||||
|
|
||||||
namespace OpenSim.Grid.MessagingServer
|
namespace OpenSim.Grid.MessagingServer.Modules
|
||||||
{
|
{
|
||||||
public class UserDataBaseService : UserManagerBase
|
public class UserDataBaseService : UserManagerBase
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Constructor.
|
/// Constructor.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// Passing null to parent because we never use any function that requires an interservice inventory call.
|
/// Passing null to parent because we never use any function that requires an interservice inventory call.
|
||||||
public UserDataBaseService()
|
public UserDataBaseService()
|
||||||
: base(null)
|
: base(null)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public UserAgentData GetUserAgentData(UUID AgentID)
|
public UserAgentData GetUserAgentData(UUID AgentID)
|
||||||
{
|
{
|
||||||
UserProfileData userProfile = GetUserProfile(AgentID);
|
UserProfileData userProfile = GetUserProfile(AgentID);
|
||||||
|
|
||||||
if (userProfile != null)
|
if (userProfile != null)
|
||||||
{
|
{
|
||||||
return userProfile.CurrentAgent;
|
return userProfile.CurrentAgent;
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override UserProfileData SetupMasterUser(string firstName, string lastName)
|
public override UserProfileData SetupMasterUser(string firstName, string lastName)
|
||||||
{
|
{
|
||||||
//throw new Exception("The method or operation is not implemented.");
|
//throw new Exception("The method or operation is not implemented.");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override UserProfileData SetupMasterUser(string firstName, string lastName, string password)
|
public override UserProfileData SetupMasterUser(string firstName, string lastName, string password)
|
||||||
{
|
{
|
||||||
//throw new Exception("The method or operation is not implemented.");
|
//throw new Exception("The method or operation is not implemented.");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override UserProfileData SetupMasterUser(UUID uuid)
|
public override UserProfileData SetupMasterUser(UUID uuid)
|
||||||
{
|
{
|
||||||
//throw new Exception("The method or operation is not implemented.");
|
//throw new Exception("The method or operation is not implemented.");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,50 +1,50 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
* * Redistributions of source code must retain the above copyright
|
* * Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* * Neither the name of the OpenSim Project nor the
|
* * Neither the name of the OpenSim Project nor the
|
||||||
* names of its contributors may be used to endorse or promote products
|
* names of its contributors may be used to endorse or promote products
|
||||||
* derived from this software without specific prior written permission.
|
* derived from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* 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
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using OpenMetaverse;
|
using OpenMetaverse;
|
||||||
using OpenSim.Data;
|
using OpenSim.Data;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
|
|
||||||
namespace OpenSim.Grid.MessagingServer
|
namespace OpenSim.Grid.MessagingServer
|
||||||
{
|
{
|
||||||
public class UserPresenceData
|
public class UserPresenceData
|
||||||
{
|
{
|
||||||
public AgentCircuitData agentData = new AgentCircuitData();
|
public AgentCircuitData agentData = new AgentCircuitData();
|
||||||
public RegionProfileData regionData = new RegionProfileData();
|
public RegionProfileData regionData = new RegionProfileData();
|
||||||
public string httpURI = String.Empty;
|
public string httpURI = String.Empty;
|
||||||
public Dictionary<UUID, FriendListItem> friendData = new Dictionary<UUID,FriendListItem>();
|
public Dictionary<UUID, FriendListItem> friendData = new Dictionary<UUID,FriendListItem>();
|
||||||
public List<UUID> subscriptionData = new List<UUID>();
|
public List<UUID> subscriptionData = new List<UUID>();
|
||||||
public bool OnlineYN = true;
|
public bool OnlineYN = true;
|
||||||
public bool lookupUserRegionYN = true;
|
public bool lookupUserRegionYN = true;
|
||||||
|
|
||||||
public UserPresenceData()
|
public UserPresenceData()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,33 +1,33 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
* * Redistributions of source code must retain the above copyright
|
* * Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* * Neither the name of the OpenSim Project nor the
|
* * Neither the name of the OpenSim Project nor the
|
||||||
* names of its contributors may be used to endorse or promote products
|
* names of its contributors may be used to endorse or promote products
|
||||||
* derived from this software without specific prior written permission.
|
* derived from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* 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
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OpenSim.Grid.MessagingServer
|
namespace OpenSim.Grid.MessagingServer.Modules
|
||||||
{
|
{
|
||||||
public class WorkUnitBase
|
public class WorkUnitBase
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,33 +1,33 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
* * Redistributions of source code must retain the above copyright
|
* * Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* * Neither the name of the OpenSim Project nor the
|
* * Neither the name of the OpenSim Project nor the
|
||||||
* names of its contributors may be used to endorse or promote products
|
* names of its contributors may be used to endorse or promote products
|
||||||
* derived from this software without specific prior written permission.
|
* derived from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* 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
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OpenSim.Grid.MessagingServer
|
namespace OpenSim.Grid.MessagingServer.Modules
|
||||||
{
|
{
|
||||||
public class WorkUnitPresenceUpdate : WorkUnitBase
|
public class WorkUnitPresenceUpdate : WorkUnitBase
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -35,6 +35,7 @@ using OpenSim.Framework;
|
||||||
using OpenSim.Framework.Console;
|
using OpenSim.Framework.Console;
|
||||||
using OpenSim.Framework.Servers;
|
using OpenSim.Framework.Servers;
|
||||||
using OpenSim.Grid.Framework;
|
using OpenSim.Grid.Framework;
|
||||||
|
using OpenSim.Grid.MessagingServer.Modules;
|
||||||
|
|
||||||
namespace OpenSim.Grid.MessagingServer
|
namespace OpenSim.Grid.MessagingServer
|
||||||
{
|
{
|
||||||
|
|
|
||||||
34
prebuild.xml
34
prebuild.xml
|
|
@ -1033,6 +1033,39 @@
|
||||||
</Files>
|
</Files>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
|
<Project name="OpenSim.Grid.MessagingServer.Modules" path="OpenSim/Grid/MessagingServer.Modules" type="Library">
|
||||||
|
<Configuration name="Debug">
|
||||||
|
<Options>
|
||||||
|
<OutputPath>../../../bin/</OutputPath>
|
||||||
|
</Options>
|
||||||
|
</Configuration>
|
||||||
|
<Configuration name="Release">
|
||||||
|
<Options>
|
||||||
|
<OutputPath>../../../bin/</OutputPath>
|
||||||
|
</Options>
|
||||||
|
</Configuration>
|
||||||
|
|
||||||
|
<ReferencePath>../../../bin/</ReferencePath>
|
||||||
|
<Reference name="System"/>
|
||||||
|
<Reference name="System.Data"/>
|
||||||
|
<Reference name="System.Xml"/>
|
||||||
|
<Reference name="OpenSim.Framework"/>
|
||||||
|
<Reference name="OpenSim.Framework.Console"/>
|
||||||
|
<Reference name="OpenSim.Framework.Communications"/>
|
||||||
|
<Reference name="OpenSim.Data"/>
|
||||||
|
<Reference name="OpenSim.Framework.Servers"/>
|
||||||
|
<Reference name="OpenSim.Grid.Framework"/>
|
||||||
|
<Reference name="OpenMetaverseTypes.dll"/>
|
||||||
|
<Reference name="OpenMetaverse.dll"/>
|
||||||
|
<Reference name="XMLRPC.dll"/>
|
||||||
|
<Reference name="log4net.dll"/>
|
||||||
|
|
||||||
|
<Files>
|
||||||
|
<Match pattern="*.cs" recurse="true"/>
|
||||||
|
</Files>
|
||||||
|
</Project>
|
||||||
|
|
||||||
|
|
||||||
<Project name="OpenSim.Grid.MessagingServer" path="OpenSim/Grid/MessagingServer" type="Exe">
|
<Project name="OpenSim.Grid.MessagingServer" path="OpenSim/Grid/MessagingServer" type="Exe">
|
||||||
<Configuration name="Debug">
|
<Configuration name="Debug">
|
||||||
<Options>
|
<Options>
|
||||||
|
|
@ -1055,6 +1088,7 @@
|
||||||
<Reference name="OpenSim.Data"/>
|
<Reference name="OpenSim.Data"/>
|
||||||
<Reference name="OpenSim.Framework.Servers"/>
|
<Reference name="OpenSim.Framework.Servers"/>
|
||||||
<Reference name="OpenSim.Grid.Framework"/>
|
<Reference name="OpenSim.Grid.Framework"/>
|
||||||
|
<Reference name="OpenSim.Grid.MessagingServer.Modules"/>
|
||||||
<Reference name="OpenMetaverseTypes.dll"/>
|
<Reference name="OpenMetaverseTypes.dll"/>
|
||||||
<Reference name="OpenMetaverse.dll"/>
|
<Reference name="OpenMetaverse.dll"/>
|
||||||
<Reference name="XMLRPC.dll"/>
|
<Reference name="XMLRPC.dll"/>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue