diff options
author | Justin Clarke Casey | 2008-06-17 20:36:21 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-06-17 20:36:21 +0000 |
commit | 16d0a895cb817f96a55091fadbbd4cfb2d909204 (patch) | |
tree | 30c2c790f64284dbce988554b0bb0c1ae3417307 /OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |
parent | * refactor: Remove largely duplicate code from SceneXmlLoader.CreatePrimFromX... (diff) | |
download | opensim-SC_OLD-16d0a895cb817f96a55091fadbbd4cfb2d909204.zip opensim-SC_OLD-16d0a895cb817f96a55091fadbbd4cfb2d909204.tar.gz opensim-SC_OLD-16d0a895cb817f96a55091fadbbd4cfb2d909204.tar.bz2 opensim-SC_OLD-16d0a895cb817f96a55091fadbbd4cfb2d909204.tar.xz |
* Refactor: Move the responsibility for applying physics and sending the initial client update to Scene.AddSceneObject() from some of the SceneObjectGroup constructors
* I think this has been done cleanly from inspection and testing, but if prim creation or load suddenly starts playing up more than usual, please open a mantis
* This also has the effect of stopping the archiver generating ghost in-world prims
* Some code dupliction also removed
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index ebc721f..ff62a3b 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -1499,7 +1499,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1499 | { | 1499 | { |
1500 | string xmlData = Helpers.FieldToUTF8String(rezAsset.Data); | 1500 | string xmlData = Helpers.FieldToUTF8String(rezAsset.Data); |
1501 | SceneObjectGroup group = new SceneObjectGroup(this, m_regionHandle, xmlData); | 1501 | SceneObjectGroup group = new SceneObjectGroup(this, m_regionHandle, xmlData); |
1502 | if (!ExternalChecks.ExternalChecksCanRezObject(group.Children.Count,remoteClient.AgentId, pos) && !attachment) | 1502 | if (!ExternalChecks.ExternalChecksCanRezObject(group.Children.Count, remoteClient.AgentId, pos) && !attachment) |
1503 | { | 1503 | { |
1504 | return null; | 1504 | return null; |
1505 | } | 1505 | } |
@@ -1513,8 +1513,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1513 | if (!attachment) | 1513 | if (!attachment) |
1514 | { | 1514 | { |
1515 | pos = GetNewRezLocation( | 1515 | pos = GetNewRezLocation( |
1516 | RayStart, RayEnd, RayTargetID, new LLQuaternion(0, 0, 0, 1), | 1516 | RayStart, RayEnd, RayTargetID, new LLQuaternion(0, 0, 0, 1), |
1517 | BypassRayCast, bRayEndIsIntersection, true, group.GroupScale(), false); | 1517 | BypassRayCast, bRayEndIsIntersection, true, group.GroupScale(), false); |
1518 | group.AbsolutePosition = pos; | 1518 | group.AbsolutePosition = pos; |
1519 | } | 1519 | } |
1520 | else | 1520 | else |