aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
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
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')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLRegionData.cs19
-rw-r--r--OpenSim/Data/MSSQL/Resources/023_RegionStore.sql7
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs17
-rw-r--r--OpenSim/Data/MySQL/Resources/031_RegionStore.sql7
-rw-r--r--OpenSim/Framework/RegionSettings.cs25
-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
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs1
10 files changed, 59 insertions, 47 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index 293282e..1aaf2a5 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -723,7 +723,7 @@ VALUES
723,[elevation_1_ne] = @elevation_1_ne ,[elevation_2_ne] = @elevation_2_ne ,[elevation_1_se] = @elevation_1_se ,[elevation_2_se] = @elevation_2_se 723,[elevation_1_ne] = @elevation_1_ne ,[elevation_2_ne] = @elevation_2_ne ,[elevation_1_se] = @elevation_1_se ,[elevation_2_se] = @elevation_2_se
724,[elevation_1_sw] = @elevation_1_sw ,[elevation_2_sw] = @elevation_2_sw ,[water_height] = @water_height ,[terrain_raise_limit] = @terrain_raise_limit 724,[elevation_1_sw] = @elevation_1_sw ,[elevation_2_sw] = @elevation_2_sw ,[water_height] = @water_height ,[terrain_raise_limit] = @terrain_raise_limit
725,[terrain_lower_limit] = @terrain_lower_limit ,[use_estate_sun] = @use_estate_sun ,[fixed_sun] = @fixed_sun ,[sun_position] = @sun_position 725,[terrain_lower_limit] = @terrain_lower_limit ,[use_estate_sun] = @use_estate_sun ,[fixed_sun] = @fixed_sun ,[sun_position] = @sun_position
726,[covenant] = @covenant , [sunvectorx] = @sunvectorx, [sunvectory] = @sunvectory, [sunvectorz] = @sunvectorz, [Sandbox] = @Sandbox, [loaded_creation_date] = @loaded_creation_date, [loaded_creation_time] = @loaded_creation_time, [loaded_creation_id] = @loaded_creation_id 726,[covenant] = @covenant , [sunvectorx] = @sunvectorx, [sunvectory] = @sunvectory, [sunvectorz] = @sunvectorz, [Sandbox] = @Sandbox, [loaded_creation_datetime] = @loaded_creation_datetime, [loaded_creation_id] = @loaded_creation_id
727 WHERE [regionUUID] = @regionUUID"; 727 WHERE [regionUUID] = @regionUUID";
728 728
729 using (AutoClosingSqlCommand cmd = _Database.Query(sql)) 729 using (AutoClosingSqlCommand cmd = _Database.Query(sql))
@@ -777,14 +777,14 @@ VALUES
777 [block_show_in_search],[agent_limit],[object_bonus],[maturity],[disable_scripts],[disable_collisions],[disable_physics], 777 [block_show_in_search],[agent_limit],[object_bonus],[maturity],[disable_scripts],[disable_collisions],[disable_physics],
778 [terrain_texture_1],[terrain_texture_2],[terrain_texture_3],[terrain_texture_4],[elevation_1_nw],[elevation_2_nw],[elevation_1_ne], 778 [terrain_texture_1],[terrain_texture_2],[terrain_texture_3],[terrain_texture_4],[elevation_1_nw],[elevation_2_nw],[elevation_1_ne],
779 [elevation_2_ne],[elevation_1_se],[elevation_2_se],[elevation_1_sw],[elevation_2_sw],[water_height],[terrain_raise_limit], 779 [elevation_2_ne],[elevation_1_se],[elevation_2_se],[elevation_1_sw],[elevation_2_sw],[water_height],[terrain_raise_limit],
780 [terrain_lower_limit],[use_estate_sun],[fixed_sun],[sun_position],[covenant],[sunvectorx], [sunvectory], [sunvectorz],[Sandbox], [loaded_creation_date], [loaded_creation_time], [loaded_creation_id] 780 [terrain_lower_limit],[use_estate_sun],[fixed_sun],[sun_position],[covenant],[sunvectorx], [sunvectory], [sunvectorz],[Sandbox], [loaded_creation_datetime], [loaded_creation_id]
781 ) 781 )
782 VALUES 782 VALUES
783 (@regionUUID,@block_terraform,@block_fly,@allow_damage,@restrict_pushing,@allow_land_resell,@allow_land_join_divide, 783 (@regionUUID,@block_terraform,@block_fly,@allow_damage,@restrict_pushing,@allow_land_resell,@allow_land_join_divide,
784 @block_show_in_search,@agent_limit,@object_bonus,@maturity,@disable_scripts,@disable_collisions,@disable_physics, 784 @block_show_in_search,@agent_limit,@object_bonus,@maturity,@disable_scripts,@disable_collisions,@disable_physics,
785 @terrain_texture_1,@terrain_texture_2,@terrain_texture_3,@terrain_texture_4,@elevation_1_nw,@elevation_2_nw,@elevation_1_ne, 785 @terrain_texture_1,@terrain_texture_2,@terrain_texture_3,@terrain_texture_4,@elevation_1_nw,@elevation_2_nw,@elevation_1_ne,
786 @elevation_2_ne,@elevation_1_se,@elevation_2_se,@elevation_1_sw,@elevation_2_sw,@water_height,@terrain_raise_limit, 786 @elevation_2_ne,@elevation_1_se,@elevation_2_se,@elevation_1_sw,@elevation_2_sw,@water_height,@terrain_raise_limit,
787 @terrain_lower_limit,@use_estate_sun,@fixed_sun,@sun_position,@covenant,@sunvectorx,@sunvectory, @sunvectorz, @Sandbox, @loaded_creation_date, @loaded_creation_time, @loaded_creation_id)"; 787 @terrain_lower_limit,@use_estate_sun,@fixed_sun,@sun_position,@covenant,@sunvectorx,@sunvectory, @sunvectorz, @Sandbox, @loaded_creation_datetime, @loaded_creation_id)";
788 788
789 using (AutoClosingSqlCommand cmd = _Database.Query(sql)) 789 using (AutoClosingSqlCommand cmd = _Database.Query(sql))
790 { 790 {
@@ -845,15 +845,7 @@ VALUES
845 ); 845 );
846 newSettings.Covenant = new UUID((Guid)row["covenant"]); 846 newSettings.Covenant = new UUID((Guid)row["covenant"]);
847 847
848 if (row["loaded_creation_date"] is DBNull) 848 newSettings.LoadedCreationDateTime = Convert.ToInt32(row["loaded_creation_datetime"]);
849 newSettings.LoadedCreationDate = "";
850 else
851 newSettings.LoadedCreationDate = (String)row["loaded_creation_date"];
852
853 if (row["loaded_creation_time"] is DBNull)
854 newSettings.LoadedCreationTime = "";
855 else
856 newSettings.LoadedCreationTime = (String)row["loaded_creation_time"];
857 849
858 if (row["loaded_creation_id"] is DBNull) 850 if (row["loaded_creation_id"] is DBNull)
859 newSettings.LoadedCreationID = ""; 851 newSettings.LoadedCreationID = "";
@@ -1257,8 +1249,7 @@ VALUES
1257 parameters.Add(_Database.CreateParameter("sunvectory", settings.SunVector.Y)); 1249 parameters.Add(_Database.CreateParameter("sunvectory", settings.SunVector.Y));
1258 parameters.Add(_Database.CreateParameter("sunvectorz", settings.SunVector.Z)); 1250 parameters.Add(_Database.CreateParameter("sunvectorz", settings.SunVector.Z));
1259 parameters.Add(_Database.CreateParameter("covenant", settings.Covenant)); 1251 parameters.Add(_Database.CreateParameter("covenant", settings.Covenant));
1260 parameters.Add(_Database.CreateParameter("LoadedCreationDate", settings.LoadedCreationDate)); 1252 parameters.Add(_Database.CreateParameter("LoadedCreationDateTime", settings.LoadedCreationDateTime));
1261 parameters.Add(_Database.CreateParameter("LoadedCreationTime", settings.LoadedCreationTime));
1262 parameters.Add(_Database.CreateParameter("LoadedCreationID", settings.LoadedCreationID)); 1253 parameters.Add(_Database.CreateParameter("LoadedCreationID", settings.LoadedCreationID));
1263 1254
1264 return parameters.ToArray(); 1255 return parameters.ToArray();
diff --git a/OpenSim/Data/MSSQL/Resources/023_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/023_RegionStore.sql
new file mode 100644
index 0000000..61b08f1
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/023_RegionStore.sql
@@ -0,0 +1,7 @@
1BEGIN TRANSACTION
2
3ALTER TABLE regionsettings DROP COLUMN loaded_creation_date;
4ALTER TABLE regionsettings DROP COLUMN loaded_creation_time;
5ALTER TABLE regionsettings ADD COLUMN loaded_creation_datetime int unsigned NOT NULL default 0;
6
7COMMIT
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 72c089e..a72ae45 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -741,7 +741,7 @@ namespace OpenSim.Data.MySQL
741 "terrain_raise_limit, terrain_lower_limit, " + 741 "terrain_raise_limit, terrain_lower_limit, " +
742 "use_estate_sun, fixed_sun, sun_position, " + 742 "use_estate_sun, fixed_sun, sun_position, " +
743 "covenant, Sandbox, sunvectorx, sunvectory, " + 743 "covenant, Sandbox, sunvectorx, sunvectory, " +
744 "sunvectorz, loaded_creation_date, loaded_creation_time, " + 744 "sunvectorz, loaded_creation_datetime, " +
745 "loaded_creation_id) values ( ?RegionUUID, ?BlockTerraform, " + 745 "loaded_creation_id) values ( ?RegionUUID, ?BlockTerraform, " +
746 "?BlockFly, ?AllowDamage, ?RestrictPushing, " + 746 "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
747 "?AllowLandResell, ?AllowLandJoinDivide, " + 747 "?AllowLandResell, ?AllowLandJoinDivide, " +
@@ -756,7 +756,7 @@ namespace OpenSim.Data.MySQL
756 "?TerrainLowerLimit, ?UseEstateSun, ?FixedSun, " + 756 "?TerrainLowerLimit, ?UseEstateSun, ?FixedSun, " +
757 "?SunPosition, ?Covenant, ?Sandbox, " + 757 "?SunPosition, ?Covenant, ?Sandbox, " +
758 "?SunVectorX, ?SunVectorY, ?SunVectorZ, " + 758 "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
759 "?LoadedCreationDate, ?LoadedCreationTime, ?LoadedCreationID)"; 759 "?LoadedCreationDateTime, ?LoadedCreationID)";
760 760
761 FillRegionSettingsCommand(cmd, rs); 761 FillRegionSettingsCommand(cmd, rs);
762 762
@@ -1042,15 +1042,7 @@ namespace OpenSim.Data.MySQL
1042 newSettings.SunPosition = Convert.ToDouble(row["sun_position"]); 1042 newSettings.SunPosition = Convert.ToDouble(row["sun_position"]);
1043 newSettings.Covenant = new UUID((String) row["covenant"]); 1043 newSettings.Covenant = new UUID((String) row["covenant"]);
1044 1044
1045 if (row["loaded_creation_date"] is DBNull) 1045 newSettings.LoadedCreationDateTime = Convert.ToInt32(row["loaded_creation_datetime"]);
1046 newSettings.LoadedCreationDate = "";
1047 else
1048 newSettings.LoadedCreationDate = (String) row["loaded_creation_date"];
1049
1050 if (row["loaded_creation_time"] is DBNull)
1051 newSettings.LoadedCreationTime = "";
1052 else
1053 newSettings.LoadedCreationTime = (String) row["loaded_creation_time"];
1054 1046
1055 if (row["loaded_creation_id"] is DBNull) 1047 if (row["loaded_creation_id"] is DBNull)
1056 newSettings.LoadedCreationID = ""; 1048 newSettings.LoadedCreationID = "";
@@ -1375,8 +1367,7 @@ namespace OpenSim.Data.MySQL
1375 cmd.Parameters.AddWithValue("FixedSun", settings.FixedSun); 1367 cmd.Parameters.AddWithValue("FixedSun", settings.FixedSun);
1376 cmd.Parameters.AddWithValue("SunPosition", settings.SunPosition); 1368 cmd.Parameters.AddWithValue("SunPosition", settings.SunPosition);
1377 cmd.Parameters.AddWithValue("Covenant", settings.Covenant.ToString()); 1369 cmd.Parameters.AddWithValue("Covenant", settings.Covenant.ToString());
1378 cmd.Parameters.AddWithValue("LoadedCreationDate", settings.LoadedCreationDate); 1370 cmd.Parameters.AddWithValue("LoadedCreationDateTime", settings.LoadedCreationDate);
1379 cmd.Parameters.AddWithValue("LoadedCreationTime", settings.LoadedCreationTime);
1380 cmd.Parameters.AddWithValue("LoadedCreationID", settings.LoadedCreationID); 1371 cmd.Parameters.AddWithValue("LoadedCreationID", settings.LoadedCreationID);
1381 1372
1382 } 1373 }
diff --git a/OpenSim/Data/MySQL/Resources/031_RegionStore.sql b/OpenSim/Data/MySQL/Resources/031_RegionStore.sql
new file mode 100644
index 0000000..d069296
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/031_RegionStore.sql
@@ -0,0 +1,7 @@
1BEGIN;
2
3ALTER TABLE regionsettings DROP COLUMN loaded_creation_date;
4ALTER TABLE regionsettings DROP COLUMN loaded_creation_time;
5ALTER TABLE regionsettings ADD COLUMN loaded_creation_datetime int unsigned NOT NULL default 0;
6
7COMMIT;
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index c05cc10..8d1212b 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -561,20 +561,31 @@ namespace OpenSim.Framework
561 set { m_Covenant = value; } 561 set { m_Covenant = value; }
562 } 562 }
563 563
564 private String m_LoadedCreationDate; 564 private int m_LoadedCreationDateTime;
565 public int LoadedCreationDateTime
566 {
567 get { return m_LoadedCreationDateTime; }
568 set { m_LoadedCreationDateTime = value; }
569 }
565 570
566 public String LoadedCreationDate 571 public String LoadedCreationDate
567 { 572 {
568 get { return m_LoadedCreationDate; } 573 get
569 set { m_LoadedCreationDate = value; } 574 {
575 TimeSpan ts = new TimeSpan(0, 0, LoadedCreationDateTime);
576 DateTime stamp = new DateTime(1970, 1, 1) + ts;
577 return stamp.ToLongDateString();
578 }
570 } 579 }
571 580
572 private String m_LoadedCreationTime;
573
574 public String LoadedCreationTime 581 public String LoadedCreationTime
575 { 582 {
576 get { return m_LoadedCreationTime; } 583 get
577 set { m_LoadedCreationTime = value; } 584 {
585 TimeSpan ts = new TimeSpan(0, 0, LoadedCreationDateTime);
586 DateTime stamp = new DateTime(1970, 1, 1) + ts;
587 return stamp.ToLongTimeString();
588 }
578 } 589 }
579 590
580 private String m_LoadedCreationID; 591 private String m_LoadedCreationID;
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();
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 2fc3791..f65f834 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -448,6 +448,8 @@ namespace OpenSim.Region.Framework.Scenes
448 // Retrieve the item from the sender 448 // Retrieve the item from the sender
449 CachedUserInfo senderUserInfo = CommsManager.UserProfileCacheService.GetUserDetails(senderId); 449 CachedUserInfo senderUserInfo = CommsManager.UserProfileCacheService.GetUserDetails(senderId);
450 450
451 Console.WriteLine("Scene.Inventory.cs: GiveInventoryItem");
452
451 if (senderUserInfo == null) 453 if (senderUserInfo == null)
452 { 454 {
453 m_log.ErrorFormat( 455 m_log.ErrorFormat(
@@ -1064,6 +1066,7 @@ namespace OpenSim.Region.Framework.Scenes
1064 1066
1065 private InventoryItemBase CreateAgentInventoryItemFromTask(UUID destAgent, SceneObjectPart part, UUID itemId) 1067 private InventoryItemBase CreateAgentInventoryItemFromTask(UUID destAgent, SceneObjectPart part, UUID itemId)
1066 { 1068 {
1069 Console.WriteLine("CreateAgentInventoryItemFromTask");
1067 TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(itemId); 1070 TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(itemId);
1068 1071
1069 if (null == taskItem) 1072 if (null == taskItem)
@@ -1133,6 +1136,7 @@ namespace OpenSim.Region.Framework.Scenes
1133 /// <param name="itemID"></param> 1136 /// <param name="itemID"></param>
1134 public InventoryItemBase MoveTaskInventoryItem(IClientAPI remoteClient, UUID folderId, SceneObjectPart part, UUID itemId) 1137 public InventoryItemBase MoveTaskInventoryItem(IClientAPI remoteClient, UUID folderId, SceneObjectPart part, UUID itemId)
1135 { 1138 {
1139 m_log.Info("Adding task inventory");
1136 InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(remoteClient.AgentId, part, itemId); 1140 InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(remoteClient.AgentId, part, itemId);
1137 1141
1138 if (agentItem == null) 1142 if (agentItem == null)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 7be7e23..5552078 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3657,6 +3657,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3657 byte[] objBytes = objId.GetBytes(); 3657 byte[] objBytes = objId.GetBytes();
3658 Array.Copy(objBytes, 0, bucket, 1, 16); 3658 Array.Copy(objBytes, 0, bucket, 1, 16);
3659 3659
3660 Console.WriteLine("Giving inventory");
3660 GridInstantMessage msg = new GridInstantMessage(World, 3661 GridInstantMessage msg = new GridInstantMessage(World,
3661 m_host.UUID, m_host.Name+", an object owned by "+ 3662 m_host.UUID, m_host.Name+", an object owned by "+
3662 resolveName(m_host.OwnerID)+",", destId, 3663 resolveName(m_host.OwnerID)+",", destId,