aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie2013-01-31 02:53:11 +0000
committerMelanie2013-01-31 02:53:11 +0000
commit9a4de546fe92105c570d6861377ec47d32b4186e (patch)
treeedfb86074fc7c78126203a2c05a38e260c0d4076 /OpenSim/Region/ClientStack
parentMerge branch 'avination' into careminster (diff)
parentAdd JsonTestStore to determine if a JsonStore is associated with (diff)
downloadopensim-SC_OLD-9a4de546fe92105c570d6861377ec47d32b4186e.zip
opensim-SC_OLD-9a4de546fe92105c570d6861377ec47d32b4186e.tar.gz
opensim-SC_OLD-9a4de546fe92105c570d6861377ec47d32b4186e.tar.bz2
opensim-SC_OLD-9a4de546fe92105c570d6861377ec47d32b4186e.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index bae41fb..0a39ded 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4963,8 +4963,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4963 // in that direction, even though we don't model this on the server. Implementing this in the future 4963 // in that direction, even though we don't model this on the server. Implementing this in the future
4964 // may improve movement smoothness. 4964 // may improve movement smoothness.
4965// acceleration = new Vector3(1, 0, 0); 4965// acceleration = new Vector3(1, 0, 0);
4966 4966
4967 angularVelocity = Vector3.Zero; 4967 angularVelocity = presence.AngularVelocity;
4968 rotation = presence.Rotation;
4968 4969
4969 if (sendTexture) 4970 if (sendTexture)
4970 textureEntry = presence.Appearance.Texture.GetBytes(); 4971 textureEntry = presence.Appearance.Texture.GetBytes();