Merge branch 'master' into careminster

1 files changed, 32 insertions, 8 deletions

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