diff options
author | UbitUmarov | 2012-07-08 13:09:32 +0100 |
---|---|---|
committer | UbitUmarov | 2012-07-08 13:09:32 +0100 |
commit | b74d4711bbf250595d422a5eecac380317d3365d (patch) | |
tree | 064b128509b7a91ebebbf94d094c1a25be16a9da /OpenSim/Region/Framework/Scenes/SOPVehicle.cs | |
parent | Merge branch 'avination' into ubitwork (diff) | |
parent | Revamp map block sending to eliminate overload of the grid server connection (diff) | |
download | opensim-SC-b74d4711bbf250595d422a5eecac380317d3365d.zip opensim-SC-b74d4711bbf250595d422a5eecac380317d3365d.tar.gz opensim-SC-b74d4711bbf250595d422a5eecac380317d3365d.tar.bz2 opensim-SC-b74d4711bbf250595d422a5eecac380317d3365d.tar.xz |
Merge branch 'avination' into ubitwork
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SOPVehicle.cs | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs index e2ef77b..41e8944 100644 --- a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs +++ b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs | |||
@@ -599,7 +599,20 @@ namespace OpenSim.Region.Framework.Scenes | |||
599 | return v; | 599 | return v; |
600 | } | 600 | } |
601 | 601 | ||
602 | public void FromXml2(XmlTextReader _reader, out bool errors) | 602 | public static SOPVehicle FromXml2(XmlTextReader reader) |
603 | { | ||
604 | SOPVehicle vehicle = new SOPVehicle(); | ||
605 | |||
606 | bool errors = false; | ||
607 | |||
608 | vehicle.FromXml2(reader, out errors); | ||
609 | if (errors) | ||
610 | return null; | ||
611 | |||
612 | return vehicle; | ||
613 | } | ||
614 | |||
615 | private void FromXml2(XmlTextReader _reader, out bool errors) | ||
603 | { | 616 | { |
604 | errors = false; | 617 | errors = false; |
605 | reader = _reader; | 618 | reader = _reader; |