diff options
author | Dan Lake | 2011-11-02 14:59:00 -0700 |
---|---|---|
committer | Dan Lake | 2011-11-02 14:59:00 -0700 |
commit | e2c51a977d42822fe78ae0744117afb7bf509d35 (patch) | |
tree | bf145756d32fec7dc295510269447f458ccaf1ea /OpenSim/Region/ClientStack/Linden | |
parent | Removed redundant SceneContents property from Scene. It's the same as SceneGr... (diff) | |
download | opensim-SC-e2c51a977d42822fe78ae0744117afb7bf509d35.zip opensim-SC-e2c51a977d42822fe78ae0744117afb7bf509d35.tar.gz opensim-SC-e2c51a977d42822fe78ae0744117afb7bf509d35.tar.bz2 opensim-SC-e2c51a977d42822fe78ae0744117afb7bf509d35.tar.xz |
Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.
UpdateFlag is now referenced/used only within SOP and SOG. Outsiders are
using ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule on
SOP consistently now. Also started working toward eliminating those
calls to ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule
from outside SOP in favor of just setting properties on SOP and let SOP
decide if an update should be scheduled. This consolidates the update
policy within SOP and the client rather than everywhere that makes
changes to SOP. Some places forget to call update while others call it
multiple times, "just to be sure".
UpdateFlag and Schedule*Update will both be made private shortly.
UpdateFlag is intended to be transient and internal to SOP so it has
been removed from XML serializer for SOPs.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs index c07fc73..e4bacd4 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | |||
@@ -332,7 +332,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
332 | 332 | ||
333 | grp.IsAttachment = false; | 333 | grp.IsAttachment = false; |
334 | // Required for linking | 334 | // Required for linking |
335 | grp.RootPart.UpdateFlag = 0; | 335 | grp.RootPart.ClearUpdateSchedule(); |
336 | 336 | ||
337 | if (m_scene.Permissions.CanRezObject(1, avatar.UUID, pos)) | 337 | if (m_scene.Permissions.CanRezObject(1, avatar.UUID, pos)) |
338 | { | 338 | { |
@@ -345,8 +345,9 @@ namespace OpenSim.Region.ClientStack.Linden | |||
345 | 345 | ||
346 | for (int j = 1; j < allparts.Length; j++) | 346 | for (int j = 1; j < allparts.Length; j++) |
347 | { | 347 | { |
348 | rootGroup.RootPart.UpdateFlag = 0; | 348 | // Required for linking |
349 | allparts[j].RootPart.UpdateFlag = 0; | 349 | rootGroup.RootPart.ClearUpdateSchedule(); |
350 | allparts[j].RootPart.ClearUpdateSchedule(); | ||
350 | rootGroup.LinkToGroup(allparts[j]); | 351 | rootGroup.LinkToGroup(allparts[j]); |
351 | } | 352 | } |
352 | 353 | ||