diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Capabilities/Handlers/GetDisplayNames | |
parent | Add a build script. (diff) | |
download | opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs | 61 | ||||
-rw-r--r-- | OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs | 2 |
2 files changed, 29 insertions, 34 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs index 589602d..41cfdb6 100644 --- a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs | |||
@@ -29,8 +29,6 @@ using System; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Collections.Specialized; | 31 | using System.Collections.Specialized; |
32 | using System.Drawing; | ||
33 | using System.Drawing.Imaging; | ||
34 | using System.Reflection; | 32 | using System.Reflection; |
35 | using System.IO; | 33 | using System.IO; |
36 | using System.Web; | 34 | using System.Web; |
@@ -38,12 +36,7 @@ using log4net; | |||
38 | using Nini.Config; | 36 | using Nini.Config; |
39 | using OpenMetaverse; | 37 | using OpenMetaverse; |
40 | using OpenMetaverse.StructuredData; | 38 | using OpenMetaverse.StructuredData; |
41 | using OpenMetaverse.Imaging; | ||
42 | using OpenSim.Framework; | ||
43 | using OpenSim.Framework.Capabilities; | ||
44 | using OpenSim.Framework.Servers; | ||
45 | using OpenSim.Framework.Servers.HttpServer; | 39 | using OpenSim.Framework.Servers.HttpServer; |
46 | using OpenSim.Region.Framework.Interfaces; | ||
47 | using OpenSim.Services.Interfaces; | 40 | using OpenSim.Services.Interfaces; |
48 | using Caps = OpenSim.Framework.Capabilities.Caps; | 41 | using Caps = OpenSim.Framework.Capabilities.Caps; |
49 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; | 42 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; |
@@ -55,7 +48,7 @@ namespace OpenSim.Capabilities.Handlers | |||
55 | { | 48 | { |
56 | private static readonly ILog m_log = | 49 | private static readonly ILog m_log = |
57 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 50 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
58 | private IUserManagement m_UserManagement; | 51 | protected IUserManagement m_UserManagement; |
59 | 52 | ||
60 | public GetDisplayNamesHandler(string path, IUserManagement umService, string name, string description) | 53 | public GetDisplayNamesHandler(string path, IUserManagement umService, string name, string description) |
61 | : base("GET", path, name, description) | 54 | : base("GET", path, name, description) |
@@ -65,12 +58,11 @@ namespace OpenSim.Capabilities.Handlers | |||
65 | 58 | ||
66 | protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 59 | protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
67 | { | 60 | { |
68 | m_log.DebugFormat("[GET_DISPLAY_NAMES]: called {0}", httpRequest.Url.Query); | 61 | // m_log.DebugFormat("[GET_DISPLAY_NAMES]: called {0}", httpRequest.Url.Query); |
69 | 62 | ||
70 | NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query); | 63 | NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query); |
71 | string[] ids = query.GetValues("ids"); | 64 | string[] ids = query.GetValues("ids"); |
72 | 65 | ||
73 | |||
74 | if (m_UserManagement == null) | 66 | if (m_UserManagement == null) |
75 | { | 67 | { |
76 | m_log.Error("[GET_DISPLAY_NAMES]: Cannot fetch display names without a user management component"); | 68 | m_log.Error("[GET_DISPLAY_NAMES]: Cannot fetch display names without a user management component"); |
@@ -78,32 +70,39 @@ namespace OpenSim.Capabilities.Handlers | |||
78 | return new byte[0]; | 70 | return new byte[0]; |
79 | } | 71 | } |
80 | 72 | ||
73 | Dictionary<UUID,string> names = m_UserManagement.GetUsersNames(ids); | ||
74 | |||
81 | OSDMap osdReply = new OSDMap(); | 75 | OSDMap osdReply = new OSDMap(); |
82 | OSDArray agents = new OSDArray(); | 76 | OSDArray agents = new OSDArray(); |
83 | 77 | ||
84 | osdReply["agents"] = agents; | 78 | osdReply["agents"] = agents; |
85 | foreach (string id in ids) | 79 | foreach (KeyValuePair<UUID,string> kvp in names) |
86 | { | 80 | { |
87 | UUID uuid = UUID.Zero; | 81 | if (string.IsNullOrEmpty(kvp.Value)) |
88 | if (UUID.TryParse(id, out uuid)) | 82 | continue; |
89 | { | 83 | if(kvp.Key == UUID.Zero) |
90 | string name = m_UserManagement.GetUserName(uuid); | 84 | continue; |
91 | if (!string.IsNullOrEmpty(name)) | ||
92 | { | ||
93 | string[] parts = name.Split(new char[] {' '}); | ||
94 | OSDMap osdname = new OSDMap(); | ||
95 | osdname["display_name_next_update"] = OSD.FromDate(DateTime.MinValue); | ||
96 | osdname["display_name_expires"] = OSD.FromDate(DateTime.Now.AddMonths(1)); | ||
97 | osdname["display_name"] = OSD.FromString(name); | ||
98 | osdname["legacy_first_name"] = parts[0]; | ||
99 | osdname["legacy_last_name"] = parts[1]; | ||
100 | osdname["username"] = OSD.FromString(name); | ||
101 | osdname["id"] = OSD.FromUUID(uuid); | ||
102 | osdname["is_display_name_default"] = OSD.FromBoolean(true); | ||
103 | 85 | ||
104 | agents.Add(osdname); | 86 | string[] parts = kvp.Value.Split(new char[] {' '}); |
105 | } | 87 | OSDMap osdname = new OSDMap(); |
88 | if(parts[0] == "Unknown") | ||
89 | { | ||
90 | osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddHours(1)); | ||
91 | osdname["display_name_expires"] = OSD.FromDate(DateTime.UtcNow.AddHours(2)); | ||
106 | } | 92 | } |
93 | else | ||
94 | { | ||
95 | osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddDays(8)); | ||
96 | osdname["display_name_expires"] = OSD.FromDate(DateTime.UtcNow.AddMonths(1)); | ||
97 | } | ||
98 | osdname["display_name"] = OSD.FromString(kvp.Value); | ||
99 | osdname["legacy_first_name"] = parts[0]; | ||
100 | osdname["legacy_last_name"] = parts[1]; | ||
101 | osdname["username"] = OSD.FromString(kvp.Value); | ||
102 | osdname["id"] = OSD.FromUUID(kvp.Key); | ||
103 | osdname["is_display_name_default"] = OSD.FromBoolean(true); | ||
104 | |||
105 | agents.Add(osdname); | ||
107 | } | 106 | } |
108 | 107 | ||
109 | // Full content request | 108 | // Full content request |
@@ -113,8 +112,6 @@ namespace OpenSim.Capabilities.Handlers | |||
113 | 112 | ||
114 | string reply = OSDParser.SerializeLLSDXmlString(osdReply); | 113 | string reply = OSDParser.SerializeLLSDXmlString(osdReply); |
115 | return System.Text.Encoding.UTF8.GetBytes(reply); | 114 | return System.Text.Encoding.UTF8.GetBytes(reply); |
116 | |||
117 | } | 115 | } |
118 | |||
119 | } | 116 | } |
120 | } \ No newline at end of file | 117 | } |
diff --git a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs index d42de56..32da1c2 100644 --- a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs +++ b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs | |||
@@ -62,8 +62,6 @@ namespace OpenSim.Capabilities.Handlers | |||
62 | if (m_UserManagement == null) | 62 | if (m_UserManagement == null) |
63 | throw new Exception(String.Format("Failed to load UserManagement from {0}; config is {1}", umService, m_ConfigName)); | 63 | throw new Exception(String.Format("Failed to load UserManagement from {0}; config is {1}", umService, m_ConfigName)); |
64 | 64 | ||
65 | string rurl = serverConfig.GetString("GetTextureRedirectURL"); | ||
66 | |||
67 | server.AddStreamHandler( | 65 | server.AddStreamHandler( |
68 | new GetDisplayNamesHandler("/CAPS/agents/", m_UserManagement, "GetDisplayNames", null)); | 66 | new GetDisplayNamesHandler("/CAPS/agents/", m_UserManagement, "GetDisplayNames", null)); |
69 | } | 67 | } |