diff options
author | Justin Clarke Casey | 2007-12-26 20:21:06 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2007-12-26 20:21:06 +0000 |
commit | 01de4bbfbdca14adfa2f86de0f672b8c7cfb92e9 (patch) | |
tree | ea79543e037a4d4642408db8f1ff57c1d6999cf2 /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |
parent | * This update includes a wide range of changes to the ODEPlugin for avatar mo... (diff) | |
download | opensim-SC_OLD-01de4bbfbdca14adfa2f86de0f672b8c7cfb92e9.zip opensim-SC_OLD-01de4bbfbdca14adfa2f86de0f672b8c7cfb92e9.tar.gz opensim-SC_OLD-01de4bbfbdca14adfa2f86de0f672b8c7cfb92e9.tar.bz2 opensim-SC_OLD-01de4bbfbdca14adfa2f86de0f672b8c7cfb92e9.tar.xz |
If a prim is persisted in the region, scripts dragged into its inventory after a server restart would not appear (though the script they contain would still be invoked). This
change fixes that problem.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 4f89dd0..33f481d 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -420,10 +420,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
420 | #region Constructors | 420 | #region Constructors |
421 | 421 | ||
422 | /// <summary> | 422 | /// <summary> |
423 | /// | 423 | /// No arg constructor called by region restore db code |
424 | /// </summary> | 424 | /// </summary> |
425 | public SceneObjectPart() | 425 | public SceneObjectPart() |
426 | { | 426 | { |
427 | // It's not necessary to persist this | ||
428 | m_inventoryFileName = "taskinventory" + LLUUID.Random().ToString(); | ||
427 | } | 429 | } |
428 | 430 | ||
429 | public SceneObjectPart(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID, | 431 | public SceneObjectPart(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID, |
@@ -1006,8 +1008,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1006 | /// <param name="localID"></param> | 1008 | /// <param name="localID"></param> |
1007 | public bool GetInventoryFileName(IClientAPI client, uint localID) | 1009 | public bool GetInventoryFileName(IClientAPI client, uint localID) |
1008 | { | 1010 | { |
1009 | if (localID == m_localID) | 1011 | // if (localID == m_localID) |
1010 | { | 1012 | // { |
1011 | if (m_inventorySerial > 0) | 1013 | if (m_inventorySerial > 0) |
1012 | { | 1014 | { |
1013 | client.SendTaskInventory(m_uuid, (short)m_inventorySerial, | 1015 | client.SendTaskInventory(m_uuid, (short)m_inventorySerial, |
@@ -1019,7 +1021,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1019 | client.SendTaskInventory(m_uuid, 0, new byte[0]); | 1021 | client.SendTaskInventory(m_uuid, 0, new byte[0]); |
1020 | return false; | 1022 | return false; |
1021 | } | 1023 | } |
1022 | } | 1024 | // } |
1023 | return false; | 1025 | return false; |
1024 | } | 1026 | } |
1025 | 1027 | ||