diff options
| author | Justin Clark-Casey (justincc) | 2010-09-21 01:01:07 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-21 01:01:07 +0100 |
| commit | 192bcab98711245e241f1b37cb12cc29a26b168e (patch) | |
| tree | 6e72ef2c0b7d20355f29119a603877786d83bf37 /OpenSim/Framework/ChildAgentDataUpdate.cs | |
| parent | If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the ... (diff) | |
| parent | * Tweaked the LocationTests for maximum coverage. (diff) | |
| download | opensim-SC-192bcab98711245e241f1b37cb12cc29a26b168e.zip opensim-SC-192bcab98711245e241f1b37cb12cc29a26b168e.tar.gz opensim-SC-192bcab98711245e241f1b37cb12cc29a26b168e.tar.bz2 opensim-SC-192bcab98711245e241f1b37cb12cc29a26b168e.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/ChildAgentDataUpdate.cs')
| -rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 89ee39c..0dc5dbc 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
| @@ -150,10 +150,10 @@ namespace OpenSim.Framework | |||
| 150 | Vector3.TryParse(args["at_axis"].AsString(), out AtAxis); | 150 | Vector3.TryParse(args["at_axis"].AsString(), out AtAxis); |
| 151 | 151 | ||
| 152 | if (args["left_axis"] != null) | 152 | if (args["left_axis"] != null) |
| 153 | Vector3.TryParse(args["left_axis"].AsString(), out AtAxis); | 153 | Vector3.TryParse(args["left_axis"].AsString(), out LeftAxis); |
| 154 | 154 | ||
| 155 | if (args["up_axis"] != null) | 155 | if (args["up_axis"] != null) |
| 156 | Vector3.TryParse(args["up_axis"].AsString(), out AtAxis); | 156 | Vector3.TryParse(args["up_axis"].AsString(), out UpAxis); |
| 157 | 157 | ||
| 158 | if (args["changed_grid"] != null) | 158 | if (args["changed_grid"] != null) |
| 159 | ChangedGrid = args["changed_grid"].AsBoolean(); | 159 | ChangedGrid = args["changed_grid"].AsBoolean(); |