OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

a few changes to new GetDisplaynames and friends

melanie
UbitUmarov 2016-12-04 17:01:49 +00:00
parent e1cf34d6fb
commit fcd1e36ed6
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@ -201,6 +201,8 @@ namespace OpenSim.Region.ClientStack.Linden
m_assetService = m_Scene.AssetService; m_assetService = m_Scene.AssetService;
m_regionName = m_Scene.RegionInfo.RegionName; m_regionName = m_Scene.RegionInfo.RegionName;
m_UserManager = m_Scene.RequestModuleInterface<IUserManagement>(); m_UserManager = m_Scene.RequestModuleInterface<IUserManagement>();
if (m_UserManager == null)
m_log.Error("[CAPS]: GetDisplayNames disabled because user management component not found");
RegisterHandlers(); RegisterHandlers();
@ -323,11 +325,14 @@ namespace OpenSim.Region.ClientStack.Linden
public void RegisterOtherHandlers() public void RegisterOtherHandlers()
{ {
try try
{
if (m_UserManager != null)
{ {
IRequestHandler GetDisplayNamesHandler = new RestStreamHandler( IRequestHandler GetDisplayNamesHandler = new RestStreamHandler(
"GET", GetNewCapPath(), GetDisplayNames, "GetDisplayNames", null); "GET", GetNewCapPath(), GetDisplayNames, "GetDisplayNames", null);
m_HostCapsObj.RegisterHandler("GetDisplayNames", GetDisplayNamesHandler); m_HostCapsObj.RegisterHandler("GetDisplayNames", GetDisplayNamesHandler);
} }
}
catch (Exception e) catch (Exception e)
{ {
m_log.Error("[CAPS]: " + e.ToString()); m_log.Error("[CAPS]: " + e.ToString());
@ -1818,22 +1823,23 @@ namespace OpenSim.Region.ClientStack.Linden
string param, IOSHttpRequest httpRequest, string param, IOSHttpRequest httpRequest,
IOSHttpResponse httpResponse) IOSHttpResponse httpResponse)
{ {
httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NoContent; httpResponse.StatusCode = (int)System.Net.HttpStatusCode.Gone;
httpResponse.ContentType = "text/plain"; httpResponse.ContentType = "text/plain";
ScenePresence sp = m_Scene.GetScenePresence(m_AgentID); ScenePresence sp = m_Scene.GetScenePresence(m_AgentID);
if(sp == null || sp.IsDeleted) if(sp == null || sp.IsDeleted)
return ""; return "";
if(sp.IsInTransit)
{
httpResponse.StatusCode = (int)System.Net.HttpStatusCode.ServiceUnavailable;
httpResponse.AddHeader("Retry-After","30");
return "";
}
NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query); NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query);
string[] ids = query.GetValues("ids"); string[] ids = query.GetValues("ids");
if (m_UserManager == null)
{
m_log.Error("[GET_DISPLAY_NAMES]: Cannot fetch display names without a user management component");
httpResponse.StatusCode = (int)System.Net.HttpStatusCode.InternalServerError;
return "";
}
Dictionary<UUID,string> names = m_UserManager.GetUsersNames(ids); Dictionary<UUID,string> names = m_UserManager.GetUsersNames(ids);