diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 4ce23979fb..08060674a3 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -255,7 +255,7 @@ namespace OpenSim.Data.MySQL
 
         public virtual void RemoveObject(UUID obj, UUID regionUUID)
         {
-//            m_log.DebugFormat("[REGION DB]: Deleting scene object {0} from {1} in database", obj, regionUUID);
+            //m_log.DebugFormat("[REGION DB]: Deleting scene object {0} from {1} in database", obj, regionUUID);
 
             List<string> uuids = new List<string>();
             lock (m_dbLock)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 5b1215a34c..5c6b6ee479 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -88,9 +88,10 @@ namespace OpenSim.Region.Framework.Scenes
         http_request = 38,
 
         path_update = 40,
+        linkset_data = 41,
 
         // marks highest numbered event
-        Size = 41
+        Size = 42
     }
 
     // this is not the right place for this
@@ -141,6 +142,7 @@ namespace OpenSim.Region.Framework.Scenes
         http_request = 1UL << 38,
 
         path_update = 1UL << 40,
+        linkset_data = 1UL << 41,
 
         anytouch = touch | touch_end | touch_start,
         anyTarget = at_target | not_at_target | at_rot_target | not_at_rot_target,
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 95b20c631d..62843ba95c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -1011,5 +1011,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int NPCLOOKAT_FOCUS = 8;
         public const int NPCLOOKAT_MOUSELOOK = 9;
         public const int NPCLOOKAT_CLEAR = 10;
+
+        // future ?? linkset_data event
+        public const int LINKSETDATA_RESET = 0;
+        public const int LINKSETDATA_UPDATE = 1;
+        public const int LINKSETDATA_DELETE = 2;
+
+        public const int LINKSETDATA_OK = 0;
+        public const int LINKSETDATA_EMEMORY = 1;
+        public const int LINKSETDATA_ENOKEY = 2;
+        public const int LINKSETDATA_EPROTECTED = 3;
+        public const int LINKSETDATA_NOTFOUND = 4;
+        public const int LINKSETDATA_NOUPDATE = 5;
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRIEventHandlers.cs b/OpenSim/Region/ScriptEngine/YEngine/MMRIEventHandlers.cs
index 905a23072f..82d859676d 100644
--- a/OpenSim/Region/ScriptEngine/YEngine/MMRIEventHandlers.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/MMRIEventHandlers.cs
@@ -74,5 +74,6 @@ namespace OpenSim.Region.ScriptEngine.Yengine
         void transaction_result(string id, int success, string data);
         void path_update(int type, LSL_List data);
         void region_cross(LSL_Vector newpos, LSL_Vector oldpos);
+        void linkset_data(LSL_Integer action, string name, string value);
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptEventCode.cs b/OpenSim/Region/ScriptEngine/YEngine/MMRScriptEventCode.cs
index 775e0a6a62..b854437df1 100644
--- a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptEventCode.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/MMRScriptEventCode.cs
@@ -83,8 +83,9 @@ namespace OpenSim.Region.ScriptEngine.Yengine
         http_request = 38,
         //
         path_update = 40,
+        linkset_data = 41,
 
         // marks highest numbered event
-        Size = 41
+        Size = 42
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstMain.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstMain.cs
index ffb15b6d2e..36d62e315a 100644
--- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstMain.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstMain.cs
@@ -241,7 +241,8 @@ namespace OpenSim.Region.ScriptEngine.Yengine
             {"on_rez", ScriptEventCode.on_rez},
             {"sensor", ScriptEventCode.sensor},
             {"http_request", ScriptEventCode.http_request},
-            {"path_update", ScriptEventCode.path_update}
+            {"path_update", ScriptEventCode.path_update},
+            {"linkset_data", ScriptEventCode.linkset_data}
         };
     }
 }