1 files changed, 6 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 4456fce..0a9d21a 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -670,6 +670,7 @@ namespace OpenSim.Region.Environment.Scenes
                        LLObject.ObjectFlags.AllowInventoryDrop |
                        LLObject.ObjectFlags.CreateSelected;
 
+
             TrimPermissions();
 
             ScheduleFullUpdate();
@@ -707,7 +708,11 @@ namespace OpenSim.Region.Environment.Scenes
             OffsetPosition = position;
             RotationOffset = rotation;
             ObjectFlags = flags;
-
+            
+            // Since we don't store script state, this is only a 'temporary' objectflag now
+            // If the object is scripted, the script will get loaded and this will be set again
+            ObjectFlags &= ~(uint)LLObject.ObjectFlags.Scripted; 
+            
             TrimPermissions();
             // ApplyPhysics();