aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-12-21 07:46:33 -0800
committerDiva Canto2009-12-21 07:46:33 -0800
commit641a789bbc3400fbbe2d5d5227bb2fc5d73e00db (patch)
treee6412f45a98439fcaf0c9783ee45df53eecb6118
parentBug fix: in standalone, HGInventoryBroker needs to get the local inventory se... (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-641a789bbc3400fbbe2d5d5227bb2fc5d73e00db.zip
opensim-SC_OLD-641a789bbc3400fbbe2d5d5227bb2fc5d73e00db.tar.gz
opensim-SC_OLD-641a789bbc3400fbbe2d5d5227bb2fc5d73e00db.tar.bz2
opensim-SC_OLD-641a789bbc3400fbbe2d5d5227bb2fc5d73e00db.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs40
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
258 258
259 public Vector3 SitTarget 259 public Vector3 SitTarget
260 { 260 {
261 get { throw new System.NotImplementedException(); } 261 get { return GetSOP().SitTargetPosition; }
262 set { throw new System.NotImplementedException(); } 262 set
263 {
264 if (CanEdit())
265 {
266 GetSOP().SitTargetPosition = value;
267 }
268 }
263 } 269 }
264 270
265 public string SitTargetText 271 public string SitTargetText
266 { 272 {
267 get { throw new System.NotImplementedException(); } 273 get { return GetSOP().SitName; }
268 set { throw new System.NotImplementedException(); } 274 set
275 {
276 if (CanEdit())
277 {
278 GetSOP().SitName = value;
279 }
280 }
269 } 281 }
270 282
271 public string TouchText 283 public string TouchText
272 { 284 {
273 get { throw new System.NotImplementedException(); } 285 get { return GetSOP().TouchName; }
274 set { throw new System.NotImplementedException(); } 286 set
287 {
288 if (CanEdit())
289 {
290 GetSOP().TouchName = value;
291 }
292 }
275 } 293 }
276 294
277 public string Text 295 public string Text
278 { 296 {
279 get { throw new System.NotImplementedException(); } 297 get { return GetSOP().Text; }
280 set { throw new System.NotImplementedException(); } 298 set
299 {
300 if (CanEdit())
301 {
302 GetSOP().SetText(value,new Vector3(1.0f,1.0f,1.0f),1.0f);
303 }
304 }
281 } 305 }
282 306
283 public bool IsRotationLockedX 307 public bool IsRotationLockedX