From 07e4958b19b0b9dc9e1955b79e735230ccc6ea6f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 1 Aug 2013 20:40:13 -0700
Subject: Turn off edit beams when object is derezed while being edited.
 (mantis #6722)

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'OpenSim/Region/Framework')

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
             // Here's where you get them.
             m_AgentControlFlags = flags;
             m_headrotation = agentData.HeadRotation;
+            byte oldState = State;
             State = agentData.State;
 
+            // We need to send this back to the client in order to stop the edit beams
+            if ((oldState & (uint)AgentState.Editing) != 0 && State == (uint)AgentState.None)
+                ControllingClient.SendAgentTerseUpdate(this);
+
+
             PhysicsActor actor = PhysicsActor;
             if (actor == null)
             {
-- 
cgit v1.1