1
0

2 Коммиты 24cbfb284a ... c3ea01144e

Автор SHA1 Сообщение Дата
  UbitUmarov c3ea01144e few lsl constants 1 неделя назад
  UbitUmarov 0a0e1ea0b1 prim inv item creation date is date of adding to prim 1 неделя назад

+ 1 - 1
OpenSim/Framework/TaskInventoryItem.cs

@@ -172,7 +172,7 @@ namespace OpenSim.Framework
         public TaskInventoryItem()
         {
             ScriptRunning = true;
-            CreationDate = (uint)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+            CreationDate = (uint)Util.UnixTimeSinceEpoch();
         }
     }
 }

+ 6 - 8
OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs

@@ -135,19 +135,17 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         public bool AddInventoryItem(UUID agentID, uint localID, InventoryItemBase item, UUID copyItemID, bool withModRights = true)
         {
-//            m_log.DebugFormat(
-//                "[PRIM INVENTORY]: Adding inventory item {0} from {1} to part with local ID {2}",
-//                item.Name, remoteClient.Name, localID);
+            //m_log.DebugFormat(
+            //    "[PRIM INVENTORY]: Adding inventory item {0} from {1} to part with local ID {2}",
+            //       item.Name, remoteClient.Name, localID);
 
             UUID newItemId = copyItemID.IsZero() ? item.ID : copyItemID;
 
             SceneObjectPart part = GetPart(localID);
             if (part is null)
             {
-                m_log.ErrorFormat(
-                    "[PRIM INVENTORY]: " +
-                    "Couldn't find prim local ID {0} in group {1}, {2} to add inventory item ID {3}",
-                    localID, Name, UUID, newItemId);
+                m_log.Error(
+                    $"[PRIM INVENTORY]: Couldn't find prim local ID {localID} in group {Name}, {UUID} to add inventory item ID {newItemId}");
                 return false;
             }
 
@@ -156,6 +154,7 @@ namespace OpenSim.Region.Framework.Scenes
                 ItemID = newItemId,
                 AssetID = item.AssetID,
                 Name = item.Name,
+                //CreationDate = (uint)Util.UnixTimeSinceEpoch(),
                 Description = item.Description,
                 OwnerID = part.OwnerID, // Transfer ownership
                 CreatorID = item.CreatorIdAsUuid,
@@ -193,7 +192,6 @@ namespace OpenSim.Region.Framework.Scenes
             // TODO: These are pending addition of those fields to TaskInventoryItem
             // taskItem.SalePrice = item.SalePrice;
             // taskItem.SaleType = item.SaleType;
-            taskItem.CreationDate = (uint)item.CreationDate;
                 
             bool addFromAllowedDrop;
             if(withModRights)

+ 4 - 0
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs

@@ -221,6 +221,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int INVENTORY_ANIMATION = 20;
         public const int INVENTORY_GESTURE = 21;
         public const int INVENTORY_SETTING = 56;
+        public const int INVENTORY_MATERIAL = 57;
 
         public const int ATTACH_CHEST = 1;
         public const int ATTACH_HEAD = 2;
@@ -379,6 +380,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int CHANGED_REGION_RESTART = 1024;
         public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART
         public const int CHANGED_MEDIA = 2048;
+        public const int CHANGED_RENDER_MATERIAL = 0x1000; //4096
+
         //ApiDesc opensim specific
         public const int CHANGED_ANIMATION = 16384;
         //ApiDesc opensim specific
@@ -539,6 +542,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         // PRIM_REFLECTION_PROBE flags
         public const int PRIM_REFLECTION_PROBE_BOX = 1; // 1
         public const int PRIM_REFLECTION_PROBE_DYNAMIC = 2; // 2
+        public const int PRIM_REFLECTION_PROBE_MIRROR = 4; // 2
 
         public const int PROFILE_NONE = 0;
         public const int PROFILE_SCRIPT_MEMORY = 1;