diff options
author | Justin Clarke Casey | 2008-06-27 14:15:14 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-06-27 14:15:14 +0000 |
commit | c9b41bdc4ea33452e675a1d12244aab196fcde29 (patch) | |
tree | b10ff60ec398de243c54579d827f2e3a51495736 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |
parent | status: work in progress, non-functional (diff) | |
download | opensim-SC-c9b41bdc4ea33452e675a1d12244aab196fcde29.zip opensim-SC-c9b41bdc4ea33452e675a1d12244aab196fcde29.tar.gz opensim-SC-c9b41bdc4ea33452e675a1d12244aab196fcde29.tar.bz2 opensim-SC-c9b41bdc4ea33452e675a1d12244aab196fcde29.tar.xz |
* Add extra backup parameter to InnerScene.AddRestoredSceneObject()
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index b8f52ec..5236014 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -94,6 +94,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
94 | /// since the group's last persistent backup | 94 | /// since the group's last persistent backup |
95 | /// </summary> | 95 | /// </summary> |
96 | public bool HasGroupChanged = false; | 96 | public bool HasGroupChanged = false; |
97 | |||
97 | public float scriptScore = 0f; | 98 | public float scriptScore = 0f; |
98 | 99 | ||
99 | private LLVector3 lastPhysGroupPos; | 100 | private LLVector3 lastPhysGroupPos; |
@@ -1530,7 +1531,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1530 | } | 1531 | } |
1531 | 1532 | ||
1532 | /// <summary> | 1533 | /// <summary> |
1533 | /// Schedule a full update for every part in this object | 1534 | /// Schedule a full update for this scene object |
1534 | /// </summary> | 1535 | /// </summary> |
1535 | public void ScheduleGroupForFullUpdate() | 1536 | public void ScheduleGroupForFullUpdate() |
1536 | { | 1537 | { |
@@ -1546,7 +1547,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1546 | } | 1547 | } |
1547 | 1548 | ||
1548 | /// <summary> | 1549 | /// <summary> |
1549 | /// | 1550 | /// Schedule a terse update for this scene object |
1550 | /// </summary> | 1551 | /// </summary> |
1551 | public void ScheduleGroupForTerseUpdate() | 1552 | public void ScheduleGroupForTerseUpdate() |
1552 | { | 1553 | { |
@@ -1562,7 +1563,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1562 | } | 1563 | } |
1563 | 1564 | ||
1564 | /// <summary> | 1565 | /// <summary> |
1565 | /// | 1566 | /// Immediately send a full update for this scene object. |
1566 | /// </summary> | 1567 | /// </summary> |
1567 | public void SendGroupFullUpdate() | 1568 | public void SendGroupFullUpdate() |
1568 | { | 1569 | { |
@@ -1583,7 +1584,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1583 | } | 1584 | } |
1584 | 1585 | ||
1585 | /// <summary> | 1586 | /// <summary> |
1586 | /// | 1587 | /// Immediately send a terse update for this scene object. |
1587 | /// </summary> | 1588 | /// </summary> |
1588 | public void SendGroupTerseUpdate() | 1589 | public void SendGroupTerseUpdate() |
1589 | { | 1590 | { |
@@ -2100,7 +2101,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2100 | #region Resize | 2101 | #region Resize |
2101 | 2102 | ||
2102 | /// <summary> | 2103 | /// <summary> |
2103 | /// | 2104 | /// Resize the given part |
2104 | /// </summary> | 2105 | /// </summary> |
2105 | /// <param name="scale"></param> | 2106 | /// <param name="scale"></param> |
2106 | /// <param name="localID"></param> | 2107 | /// <param name="localID"></param> |
@@ -2531,6 +2532,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
2531 | } | 2532 | } |
2532 | } | 2533 | } |
2533 | } | 2534 | } |
2535 | |||
2536 | /// <summary> | ||
2537 | /// Set the user group to which this scene object belongs. | ||
2538 | /// </summary> | ||
2539 | /// <param name="GroupID"></param> | ||
2540 | /// <param name="client"></param> | ||
2534 | public void SetGroup(LLUUID GroupID, IClientAPI client) | 2541 | public void SetGroup(LLUUID GroupID, IClientAPI client) |
2535 | { | 2542 | { |
2536 | lock (m_parts) | 2543 | lock (m_parts) |
@@ -2540,6 +2547,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2540 | part.SetGroup(GroupID, client); | 2547 | part.SetGroup(GroupID, client); |
2541 | } | 2548 | } |
2542 | } | 2549 | } |
2550 | |||
2543 | ScheduleGroupForFullUpdate(); | 2551 | ScheduleGroupForFullUpdate(); |
2544 | } | 2552 | } |
2545 | } | 2553 | } |