diff options
author | Melanie | 2010-01-03 21:43:39 +0000 |
---|---|---|
committer | Melanie | 2010-01-03 21:43:39 +0000 |
commit | 61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11 (patch) | |
tree | 7780b88dc26de91fe0b95a0a234a7f995adf5d22 /OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | |
parent | Add virtual method StateChange to ScriptBaseClass (diff) | |
parent | Cause llSetText to send prim updates. (diff) | |
download | opensim-SC-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.zip opensim-SC-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.gz opensim-SC-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.bz2 opensim-SC-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs index 9596d13..31f28e0 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | |||
@@ -264,7 +264,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
264 | if (CanEdit()) | 264 | if (CanEdit()) |
265 | { | 265 | { |
266 | GetSOP().SitTargetPosition = value; | 266 | GetSOP().SitTargetPosition = value; |
267 | } | 267 | } |
268 | } | 268 | } |
269 | } | 269 | } |
270 | 270 | ||
@@ -276,7 +276,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
276 | if (CanEdit()) | 276 | if (CanEdit()) |
277 | { | 277 | { |
278 | GetSOP().SitName = value; | 278 | GetSOP().SitName = value; |
279 | } | 279 | } |
280 | } | 280 | } |
281 | } | 281 | } |
282 | 282 | ||
@@ -288,7 +288,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
288 | if (CanEdit()) | 288 | if (CanEdit()) |
289 | { | 289 | { |
290 | GetSOP().TouchName = value; | 290 | GetSOP().TouchName = value; |
291 | } | 291 | } |
292 | } | 292 | } |
293 | } | 293 | } |
294 | 294 | ||
@@ -384,7 +384,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
384 | m_rootScene.SimChat(msg, ChatTypeEnum.Say, sop.AbsolutePosition, sop.Name, sop.UUID, false); | 384 | m_rootScene.SimChat(msg, ChatTypeEnum.Say, sop.AbsolutePosition, sop.Name, sop.UUID, false); |
385 | } | 385 | } |
386 | 386 | ||
387 | public void Say(string msg,int channel) | 387 | public void Say(string msg,int channel) |
388 | { | 388 | { |
389 | if (!CanEdit()) | 389 | if (!CanEdit()) |
390 | return; | 390 | return; |
@@ -392,7 +392,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
392 | SceneObjectPart sop = GetSOP(); | 392 | SceneObjectPart sop = GetSOP(); |
393 | m_rootScene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Say,channel, sop.AbsolutePosition, sop.Name, sop.UUID, false); | 393 | m_rootScene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Say,channel, sop.AbsolutePosition, sop.Name, sop.UUID, false); |
394 | } | 394 | } |
395 | 395 | ||
396 | #endregion | 396 | #endregion |
397 | 397 | ||
398 | 398 | ||