diff options
author | CasperW | 2009-12-23 14:15:27 +0100 |
---|---|---|
committer | CasperW | 2009-12-23 14:15:27 +0100 |
commit | c54e0953d09f74be65f7f1939af16afcb8ade054 (patch) | |
tree | 30fdda415425190bb50a752d7b84f64e0a29db9b /OpenSim/Region/OptionalModules | |
parent | Added some null reference and deleted group checks to certain functions to fi... (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-c54e0953d09f74be65f7f1939af16afcb8ade054.zip opensim-SC-c54e0953d09f74be65f7f1939af16afcb8ade054.tar.gz opensim-SC-c54e0953d09f74be65f7f1939af16afcb8ade054.tar.bz2 opensim-SC-c54e0953d09f74be65f7f1939af16afcb8ade054.tar.xz |
Merge branch 'master' of ssh://TOR/var/git/careminster
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | 40 |
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 |