aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorSean Dague2009-06-29 15:05:12 +0000
committerSean Dague2009-06-29 15:05:12 +0000
commit3dc2010da6412941bfbcdb29007b12a8f37b7bef (patch)
treef9fa0ad53b712d91d8fcc21aa6513c8a94dd4bf4 /OpenSim/Region/CoreModules
parentThank you kindly, Godfrey, for a patch that: (diff)
downloadopensim-SC_OLD-3dc2010da6412941bfbcdb29007b12a8f37b7bef.zip
opensim-SC_OLD-3dc2010da6412941bfbcdb29007b12a8f37b7bef.tar.gz
opensim-SC_OLD-3dc2010da6412941bfbcdb29007b12a8f37b7bef.tar.bz2
opensim-SC_OLD-3dc2010da6412941bfbcdb29007b12a8f37b7bef.tar.xz
From: Chris Yeoh <yeohc@au1.ibm.com>
Attached is a patch that changes the oar file saving of creation date/time to an integer instead of a string. I did this after justincc emailed me saying there is a problem with internationalisation doing it the old way and I said I'd fix it. Its been tested with MySQL and I've made the changes for MSSQL but that hasn't been well tested.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs15
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs6
3 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index d862c06..811d4cc 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -128,11 +128,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
128 128
129 private void OnInstantMessage(IClientAPI client, GridInstantMessage im) 129 private void OnInstantMessage(IClientAPI client, GridInstantMessage im)
130 { 130 {
131 m_log.InfoFormat("OnInstantMessage {0}", im.dialog);
131 Scene scene = FindClientScene(client.AgentId); 132 Scene scene = FindClientScene(client.AgentId);
132 133
133 if (scene == null) // Something seriously wrong here. 134 if (scene == null) // Something seriously wrong here.
134 return; 135 return;
135 136
137
138
136 if (im.dialog == (byte) InstantMessageDialog.InventoryOffered) 139 if (im.dialog == (byte) InstantMessageDialog.InventoryOffered)
137 { 140 {
138 //m_log.DebugFormat("Asset type {0}", ((AssetType)im.binaryBucket[0])); 141 //m_log.DebugFormat("Asset type {0}", ((AssetType)im.binaryBucket[0]));
@@ -177,6 +180,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
177 { 180 {
178 // First byte of the array is probably the item type 181 // First byte of the array is probably the item type
179 // Next 16 bytes are the UUID 182 // Next 16 bytes are the UUID
183 m_log.Info("OnInstantMessage - giving item");
180 184
181 UUID itemID = new UUID(im.binaryBucket, 1); 185 UUID itemID = new UUID(im.binaryBucket, 1);
182 186
@@ -382,6 +386,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
382 { 386 {
383 // Check if this is ours to handle 387 // Check if this is ours to handle
384 // 388 //
389 m_log.Info("OnFridInstantMessage");
385 if (msg.dialog != (byte) InstantMessageDialog.InventoryOffered) 390 if (msg.dialog != (byte) InstantMessageDialog.InventoryOffered)
386 return; 391 return;
387 392
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 5c596a1..150798b 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -504,24 +504,19 @@ namespace OpenSim.Region.CoreModules.World.Archiver
504 RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings; 504 RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings;
505 505
506 // Loaded metadata will empty if no information exists in the archive 506 // Loaded metadata will empty if no information exists in the archive
507 currentRegionSettings.LoadedCreationDate = ""; 507 currentRegionSettings.LoadedCreationDateTime = 0;
508 currentRegionSettings.LoadedCreationTime = "";
509 currentRegionSettings.LoadedCreationID = ""; 508 currentRegionSettings.LoadedCreationID = "";
510 509
511 while (xtr.Read()) 510 while (xtr.Read())
512 { 511 {
513 if (xtr.NodeType == XmlNodeType.Element) 512 if (xtr.NodeType == XmlNodeType.Element)
514 { 513 {
515 if (xtr.Name.ToString() == "date") 514 if (xtr.Name.ToString() == "datetime")
516 { 515 {
517 // Disable date & time for now until load problem in 516 int value;
518 // http://opensimulator.org/mantis/view.php?id=3741 (note 0012120 by WWWench) is resolved 517 if (Int32.TryParse(xtr.ReadElementContentAsString(), out value))
519 //currentRegionSettings.LoadedCreationDate = xtr.ReadElementContentAsString(); 518 currentRegionSettings.LoadedCreationDateTime = value;
520 } 519 }
521 else if (xtr.Name.ToString() == "time")
522 {
523 //currentRegionSettings.LoadedCreationTime = xtr.ReadElementContentAsString();
524 }
525 else if (xtr.Name.ToString() == "id") 520 else if (xtr.Name.ToString() == "id")
526 { 521 {
527 currentRegionSettings.LoadedCreationID = xtr.ReadElementContentAsString(); 522 currentRegionSettings.LoadedCreationID = xtr.ReadElementContentAsString();
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
index ac5d067..a62c5b3 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -152,12 +152,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
152 xtw.WriteStartDocument(); 152 xtw.WriteStartDocument();
153 xtw.WriteStartElement("archive"); 153 xtw.WriteStartElement("archive");
154 xtw.WriteAttributeString("major_version", "0"); 154 xtw.WriteAttributeString("major_version", "0");
155 xtw.WriteAttributeString("minor_version", "2"); 155 xtw.WriteAttributeString("minor_version", "3");
156 156
157 xtw.WriteStartElement("creation_info"); 157 xtw.WriteStartElement("creation_info");
158 DateTime now = DateTime.UtcNow; 158 DateTime now = DateTime.UtcNow;
159 xtw.WriteElementString("date", now.ToLongDateString()); 159 TimeSpan t = now - new DateTime(1970, 1, 1);
160 xtw.WriteElementString("time", now.ToLongTimeString()); 160 xtw.WriteElementString("datetime", ((int)t.TotalSeconds).ToString());
161 xtw.WriteElementString("id", UUID.Random().ToString()); 161 xtw.WriteElementString("id", UUID.Random().ToString());
162 xtw.WriteEndElement(); 162 xtw.WriteEndElement();
163 xtw.WriteEndElement(); 163 xtw.WriteEndElement();