diff options
author | Diva Canto | 2013-08-01 20:40:13 -0700 |
---|---|---|
committer | Diva Canto | 2013-08-01 20:40:13 -0700 |
commit | 07e4958b19b0b9dc9e1955b79e735230ccc6ea6f (patch) | |
tree | f1ed52290be713d95c917cbc9f3ee8cc4bea32fd /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | minor: replace veclist.Add(new Vector3(0,0,0)) with Vector3.Zero in Inventory... (diff) | |
download | opensim-SC_OLD-07e4958b19b0b9dc9e1955b79e735230ccc6ea6f.zip opensim-SC_OLD-07e4958b19b0b9dc9e1955b79e735230ccc6ea6f.tar.gz opensim-SC_OLD-07e4958b19b0b9dc9e1955b79e735230ccc6ea6f.tar.bz2 opensim-SC_OLD-07e4958b19b0b9dc9e1955b79e735230ccc6ea6f.tar.xz |
Turn off edit beams when object is derezed while being edited. (mantis #6722)
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 17da0d9..456c8cc 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1568,8 +1568,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
1568 | // Here's where you get them. | 1568 | // Here's where you get them. |
1569 | m_AgentControlFlags = flags; | 1569 | m_AgentControlFlags = flags; |
1570 | m_headrotation = agentData.HeadRotation; | 1570 | m_headrotation = agentData.HeadRotation; |
1571 | byte oldState = State; | ||
1571 | State = agentData.State; | 1572 | State = agentData.State; |
1572 | 1573 | ||
1574 | // We need to send this back to the client in order to stop the edit beams | ||
1575 | if ((oldState & (uint)AgentState.Editing) != 0 && State == (uint)AgentState.None) | ||
1576 | ControllingClient.SendAgentTerseUpdate(this); | ||
1577 | |||
1578 | |||
1573 | PhysicsActor actor = PhysicsActor; | 1579 | PhysicsActor actor = PhysicsActor; |
1574 | if (actor == null) | 1580 | if (actor == null) |
1575 | { | 1581 | { |