aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs14
1 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index b42375f..61d10c9 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -83,6 +83,7 @@ namespace OpenSim.Region.Environment.Scenes
83 SCALE = 0x40 83 SCALE = 0x40
84 } 84 }
85 85
86
86 [Serializable] 87 [Serializable]
87 public partial class SceneObjectPart : IScriptHost, ISerializable 88 public partial class SceneObjectPart : IScriptHost, ISerializable
88 { 89 {
@@ -729,8 +730,7 @@ namespace OpenSim.Region.Environment.Scenes
729 m_folderID = LLUUID.Random(); 730 m_folderID = LLUUID.Random();
730 731
731 Flags = 0; 732 Flags = 0;
732 Flags |= LLObject.ObjectFlags.Touch | 733 Flags |= LLObject.ObjectFlags.AllowInventoryDrop |
733 LLObject.ObjectFlags.AllowInventoryDrop |
734 LLObject.ObjectFlags.CreateSelected; 734 LLObject.ObjectFlags.CreateSelected;
735 735
736 736
@@ -774,7 +774,7 @@ namespace OpenSim.Region.Environment.Scenes
774 774
775 // Since we don't store script state, this is only a 'temporary' objectflag now 775 // Since we don't store script state, this is only a 'temporary' objectflag now
776 // If the object is scripted, the script will get loaded and this will be set again 776 // If the object is scripted, the script will get loaded and this will be set again
777 ObjectFlags &= ~(uint)LLObject.ObjectFlags.Scripted; 777 ObjectFlags &= ~(uint)(LLObject.ObjectFlags.Scripted | LLObject.ObjectFlags.Touch);
778 778
779 TrimPermissions(); 779 TrimPermissions();
780 // ApplyPhysics(); 780 // ApplyPhysics();
@@ -2312,6 +2312,14 @@ namespace OpenSim.Region.Environment.Scenes
2312 SetText( text ); 2312 SetText( text );
2313 } 2313 }
2314 2314
2315 public void setScriptEvents(LLUUID scriptID, int events)
2316 {
2317 if (m_parentGroup != null)
2318 {
2319 m_parentGroup.SetScriptEvents(scriptID, events);
2320 }
2321 }
2322
2315 protected SceneObjectPart(SerializationInfo info, StreamingContext context) 2323 protected SceneObjectPart(SerializationInfo info, StreamingContext context)
2316 { 2324 {
2317 //System.Console.WriteLine("SceneObjectPart Deserialize BGN"); 2325 //System.Console.WriteLine("SceneObjectPart Deserialize BGN");