aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2015-10-05 10:43:45 +0100
committerUbitUmarov2015-10-05 10:43:45 +0100
commit24ca32d8a89c45a26bf4fed0f4c684315b7ec340 (patch)
tree3f7cea6d815472e5be5a25d72a575c66564078a7 /OpenSim
parent in llAttachToAvatarTemp() (TempAttachmentsModule) dont add to inventory, lik... (diff)
downloadopensim-SC_OLD-24ca32d8a89c45a26bf4fed0f4c684315b7ec340.zip
opensim-SC_OLD-24ca32d8a89c45a26bf4fed0f4c684315b7ec340.tar.gz
opensim-SC_OLD-24ca32d8a89c45a26bf4fed0f4c684315b7ec340.tar.bz2
opensim-SC_OLD-24ca32d8a89c45a26bf4fed0f4c684315b7ec340.tar.xz
send DisplayNames dates in UTC and not region local time. send a next update date that can be parsed and make it also in future so name edition is blocked since we don't suport them. (singu fails to display date, and seems to fail converting utc to local time
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs
index 9031a47..f7f9da9 100644
--- a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs
@@ -92,8 +92,11 @@ namespace OpenSim.Capabilities.Handlers
92 { 92 {
93 string[] parts = name.Split(new char[] {' '}); 93 string[] parts = name.Split(new char[] {' '});
94 OSDMap osdname = new OSDMap(); 94 OSDMap osdname = new OSDMap();
95 osdname["display_name_next_update"] = OSD.FromDate(DateTime.MinValue); 95 // a date that is valid
96 osdname["display_name_expires"] = OSD.FromDate(DateTime.Now.AddMonths(1)); 96// osdname["display_name_next_update"] = OSD.FromDate(new DateTime(1970,1,1));
97 // but send one that blocks edition, since we actually don't suport this
98 osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddDays(8));
99 osdname["display_name_expires"] = OSD.FromDate(DateTime.UtcNow.AddMonths(1));
97 osdname["display_name"] = OSD.FromString(name); 100 osdname["display_name"] = OSD.FromString(name);
98 osdname["legacy_first_name"] = parts[0]; 101 osdname["legacy_first_name"] = parts[0];
99 osdname["legacy_last_name"] = parts[1]; 102 osdname["legacy_last_name"] = parts[1];