diff --git a/OpenMetaverse/ObjectManager.cs b/OpenMetaverse/ObjectManager.cs
index 4b167337..e7b41a2a 100644
--- a/OpenMetaverse/ObjectManager.cs
+++ b/OpenMetaverse/ObjectManager.cs
@@ -3058,14 +3058,26 @@ namespace OpenMetaverse
 
         #region Object Tracking Link
 
-        /// <summary>
+                /// <summary>
         /// 
         /// </summary>
         /// <param name="simulator"></param>
         /// <param name="localID"></param>
         /// <param name="fullID"></param>
         /// <returns></returns>
-        protected Primitive GetPrimitive(Simulator simulator, uint localID, UUID fullID)
+        protected Primitive GetPrimitive(Simulator simulator, uint localID, UUID fullID)
+        {
+            return GetPrimitive(simulator, localID, fullID, true);
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="simulator"></param>
+        /// <param name="localID"></param>
+        /// <param name="fullID"></param>
+        /// <param name="createIfMissing"></param>
+        /// <returns></returns>
+        public Primitive GetPrimitive(Simulator simulator, uint localID, UUID fullID, bool createIfMissing)
         {
             if (Client.Settings.OBJECT_TRACKING)
             {
@@ -3079,7 +3091,8 @@ namespace OpenMetaverse
                         return prim;
                     }
                     else
-                    {
+                    {
+                        if (!createIfMissing) return null;                        
                         prim = new Primitive();
                         prim.LocalID = localID;
                         prim.ID = fullID;