diff options
| author | Justin Clark-Casey (justincc) | 2011-11-03 20:12:10 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-11-03 20:12:10 +0000 |
| commit | a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec (patch) | |
| tree | f26aa58d3a31ea6460a9cb76cc70a2ccb34945cc /OpenSim/Region/ClientStack/Linden | |
| parent | Change default say distance to 20m from 30m, the same as on the big grid. Th... (diff) | |
| parent | Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer size (diff) | |
| download | opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.zip opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.tar.gz opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.tar.bz2 opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 | ||