diff options
author | Justin Clarke Casey | 2008-06-27 16:36:19 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-06-27 16:36:19 +0000 |
commit | 9bf67201c31d531e0480e67d8a96472d0a5b0c76 (patch) | |
tree | cb3123ab6062efd7f32762b5a8a88bf1f58a35a5 /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |
parent | dr scofield's warning safari: hunting down those little buggers (diff) | |
download | opensim-SC-9bf67201c31d531e0480e67d8a96472d0a5b0c76.zip opensim-SC-9bf67201c31d531e0480e67d8a96472d0a5b0c76.tar.gz opensim-SC-9bf67201c31d531e0480e67d8a96472d0a5b0c76.tar.bz2 opensim-SC-9bf67201c31d531e0480e67d8a96472d0a5b0c76.tar.xz |
* Remove responsibilty for signalling scene object change from SceneObjectPart.SendFullUpdate()
* This means that we will no longer pointlessly repersist all the prims in the scene when OpenSim first starts up
* This also means that force-update on the console will not trigger repersistence.
* Also, in other places persistence is no longer done where it wasn't actually necessary
* I think I changed the code for all instances correctly, but it's not possible that I missed some and some things which did persist properly have stopped
* Please patch or mantis if this is the case
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 94d661c..af535cc 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -1660,7 +1660,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
1660 | { | 1660 | { |
1661 | if (m_parentGroup != null) | 1661 | if (m_parentGroup != null) |
1662 | { | 1662 | { |
1663 | m_parentGroup.HasGroupChanged = true; | ||
1664 | m_parentGroup.QueueForUpdateCheck(); | 1663 | m_parentGroup.QueueForUpdateCheck(); |
1665 | } | 1664 | } |
1666 | 1665 | ||
@@ -1766,7 +1765,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1766 | #region Shape | 1765 | #region Shape |
1767 | 1766 | ||
1768 | /// <summary> | 1767 | /// <summary> |
1769 | /// | 1768 | /// Update the shape of this part. |
1770 | /// </summary> | 1769 | /// </summary> |
1771 | /// <param name="shapeBlock"></param> | 1770 | /// <param name="shapeBlock"></param> |
1772 | public void UpdateShape(ObjectShapePacket.ObjectDataBlock shapeBlock) | 1771 | public void UpdateShape(ObjectShapePacket.ObjectDataBlock shapeBlock) |
@@ -1793,6 +1792,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1793 | { | 1792 | { |
1794 | PhysActor.Shape = m_shape; | 1793 | PhysActor.Shape = m_shape; |
1795 | } | 1794 | } |
1795 | |||
1796 | ParentGroup.HasGroupChanged = true; | ||
1796 | ScheduleFullUpdate(); | 1797 | ScheduleFullUpdate(); |
1797 | } | 1798 | } |
1798 | 1799 | ||
@@ -2012,6 +2013,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2012 | } | 2013 | } |
2013 | } | 2014 | } |
2014 | 2015 | ||
2016 | ParentGroup.HasGroupChanged = true; | ||
2015 | ScheduleFullUpdate(); | 2017 | ScheduleFullUpdate(); |
2016 | } | 2018 | } |
2017 | 2019 | ||
@@ -2066,13 +2068,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
2066 | #region Texture | 2068 | #region Texture |
2067 | 2069 | ||
2068 | /// <summary> | 2070 | /// <summary> |
2069 | /// | 2071 | /// Update the texture entry for this part. |
2070 | /// </summary> | 2072 | /// </summary> |
2071 | /// <param name="textureEntry"></param> | 2073 | /// <param name="textureEntry"></param> |
2072 | public void UpdateTextureEntry(byte[] textureEntry) | 2074 | public void UpdateTextureEntry(byte[] textureEntry) |
2073 | { | 2075 | { |
2074 | m_shape.TextureEntry = textureEntry; | 2076 | m_shape.TextureEntry = textureEntry; |
2075 | TriggerScriptChangedEvent(Changed.TEXTURE); | 2077 | TriggerScriptChangedEvent(Changed.TEXTURE); |
2078 | |||
2079 | ParentGroup.HasGroupChanged = true; | ||
2076 | ScheduleFullUpdate(); | 2080 | ScheduleFullUpdate(); |
2077 | } | 2081 | } |
2078 | 2082 | ||
@@ -2301,7 +2305,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2301 | #region Resizing/Scale | 2305 | #region Resizing/Scale |
2302 | 2306 | ||
2303 | /// <summary> | 2307 | /// <summary> |
2304 | /// | 2308 | /// Resize this part. |
2305 | /// </summary> | 2309 | /// </summary> |
2306 | /// <param name="scale"></param> | 2310 | /// <param name="scale"></param> |
2307 | public void Resize(LLVector3 scale) | 2311 | public void Resize(LLVector3 scale) |
@@ -2309,6 +2313,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2309 | StoreUndoState(); | 2313 | StoreUndoState(); |
2310 | m_shape.Scale = scale; | 2314 | m_shape.Scale = scale; |
2311 | 2315 | ||
2316 | ParentGroup.HasGroupChanged = true; | ||
2312 | ScheduleFullUpdate(); | 2317 | ScheduleFullUpdate(); |
2313 | } | 2318 | } |
2314 | 2319 | ||
@@ -2576,12 +2581,24 @@ namespace OpenSim.Region.Environment.Scenes | |||
2576 | { | 2581 | { |
2577 | } | 2582 | } |
2578 | 2583 | ||
2584 | /// <summary> | ||
2585 | /// Set the text displayed for this part. | ||
2586 | /// </summary> | ||
2587 | /// <param name="text"></param> | ||
2579 | public void SetText(string text) | 2588 | public void SetText(string text) |
2580 | { | 2589 | { |
2581 | Text = text; | 2590 | Text = text; |
2591 | |||
2592 | ParentGroup.HasGroupChanged = true; | ||
2582 | ScheduleFullUpdate(); | 2593 | ScheduleFullUpdate(); |
2583 | } | 2594 | } |
2584 | 2595 | ||
2596 | /// <summary> | ||
2597 | /// Set the text displayed for this part. | ||
2598 | /// </summary> | ||
2599 | /// <param name="text"></param> | ||
2600 | /// <param name="color"></param> | ||
2601 | /// <param name="alpha"></param> | ||
2585 | public void SetText(string text, Vector3 color, double alpha) | 2602 | public void SetText(string text, Vector3 color, double alpha) |
2586 | { | 2603 | { |
2587 | Color = Color.FromArgb(0xff - (int) (alpha*0xff), | 2604 | Color = Color.FromArgb(0xff - (int) (alpha*0xff), |