Merge branch 'master' into careminster

2 files changed, 33 insertions, 8 deletions

diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 7305795..42e6510 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -171,6 +171,7 @@ namespace OpenSim.Framework.Communications.Cache
             item.NextPermissions = (uint)config.GetLong("nextPermissions", 0x7FFFFFFF);
             item.EveryOnePermissions = (uint)config.GetLong("everyonePermissions", 0x7FFFFFFF);
             item.BasePermissions = (uint)config.GetLong("basePermissions", 0x7FFFFFFF);
+            item.Flags = (uint)config.GetInt("flags", 0);
 
             if (libraryFolders.ContainsKey(item.Folder))
             {
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
index 1f1ebae..143c454 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
@@ -258,26 +258,50 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 
         public Vector3 SitTarget
         {
-            get { throw new System.NotImplementedException(); }
-            set { throw new System.NotImplementedException(); }
+            get { return GetSOP().SitTargetPosition; }
+            set 
+            { 
+                if (CanEdit())
+                {
+                    GetSOP().SitTargetPosition = value;
+                }        
+            }
         }
 
         public string SitTargetText
         {
-            get { throw new System.NotImplementedException(); }
-            set { throw new System.NotImplementedException(); }
+            get { return GetSOP().SitName; }
+            set 
+            { 
+                if (CanEdit())
+                {
+                    GetSOP().SitName = value;
+                }       
+            }
         }
 
         public string TouchText
         {
-            get { throw new System.NotImplementedException(); }
-            set { throw new System.NotImplementedException(); }
+            get { return GetSOP().TouchName; }
+            set 
+            {
+                if (CanEdit())
+                {
+                    GetSOP().TouchName = value;
+                }                               
+            }
         }
 
         public string Text
         {
-            get { throw new System.NotImplementedException(); }
-            set { throw new System.NotImplementedException(); }
+            get { return GetSOP().Text; }
+            set 
+            {
+                if (CanEdit())
+                {
+                    GetSOP().SetText(value,new Vector3(1.0f,1.0f,1.0f),1.0f);
+                }
+            }
         }
 
         public bool IsRotationLockedX